Commits · dad576a7771678ac4caf455272e03d2c779298ee · Kirill Smelkov / gitlab-ce · GitLab

18 Dec, 2013 6 commits
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · dad576a7
  Dmitriy Zaporozhets authored Dec 18, 2013
  
  dad576a7
- Merge branch 'feature/email_on_push_service' of /home/git/repositories/gitlab/gitlabhq · afd747d4
  Dmitriy Zaporozhets authored Dec 18, 2013
  
  afd747d4
- Merge pull request #5868 from beautyfree/patch-1 · bb0a47d4
  Dmitriy Zaporozhets authored Dec 18, 2013
```
Duplicate opened scope for issue
```
  bb0a47d4
- Merge pull request #5869 from Spone/patch-1 · bea6eba8
  Dmitriy Zaporozhets authored Dec 18, 2013
```
Tiny wording fix
```
  bea6eba8
- Move EmailOnPush logic to async worker · 6ac73f45
  Dmitriy Zaporozhets authored Dec 18, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6ac73f45
- Email on push mailer spec · fc3878c0
  Dmitriy Zaporozhets authored Dec 18, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fc3878c0
17 Dec, 2013 18 commits
- tiny wording fix · ff0d8a18
  Hans Lemuet authored Dec 18, 2013
```
GitLab users can can see this snippet -> GitLab users can see this snippet
```
  ff0d8a18
- Duplicate opened scope for issue · 984eb08c
  Alexey Elizarov authored Dec 17, 2013
```
Was it correct?
```
  984eb08c
- Merge branch 'contributing-enhancements' of /home/git/repositories/gitlab/gitlabhq · 26c8b316
  Dmitriy Zaporozhets authored Dec 17, 2013
  
  26c8b316
- Better description to EmailsOnPush service · 5f85d6d1
  Dmitriy Zaporozhets authored Dec 17, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5f85d6d1
- Add spinach tests for email on push service · 68f8ffb5
  Dmitriy Zaporozhets authored Dec 17, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  68f8ffb5
- Email on push: dont send email if new branch was pushed or branch was removed · 074efd8f
  Dmitriy Zaporozhets authored Dec 17, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  074efd8f
- Add templates for Emails on push · 8b89ef86
  Dmitriy Zaporozhets authored Dec 17, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8b89ef86
- Fix db schema · 0b59af49
  Dmitriy Zaporozhets authored Dec 17, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0b59af49
- Add new method to mailer for deliver emails with push info · d5509339
  Dmitriy Zaporozhets authored Dec 17, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d5509339
- Add project_services dir to autoload path · 2428a0b2
  Dmitriy Zaporozhets authored Dec 17, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2428a0b2
- Create EmailsOnPushService model · 86a8796b
  Dmitriy Zaporozhets authored Dec 17, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  86a8796b
- Sort project services by title. Add textarea support to it · 5ac57305
  Dmitriy Zaporozhets authored Dec 17, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5ac57305
- Move project services models to own subdirectory · b90cbfd2
  Dmitriy Zaporozhets authored Dec 17, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b90cbfd2
- Add 6.4 entries to CHANGELOG · 9c668133
  Dmitriy Zaporozhets authored Dec 17, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9c668133
- Fix tests · 26a5695e
  Dmitriy Zaporozhets authored Dec 17, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  26a5695e
- More hints for pull requests. · 49ad8f3b
  dosire authored Dec 17, 2013
  
  49ad8f3b
- Merge pull request #5862 from jvanbaarsen/patch-1 · 3d7edf0f
  Dmitriy Zaporozhets authored Dec 16, 2013
```
Fixed the no_avatar.png path
```
  3d7edf0f
- Merge branch 'improve/devise_ui' of /home/git/repositories/gitlab/gitlabhq · fe07c737
  Dmitriy Zaporozhets authored Dec 17, 2013
  
  fe07c737
16 Dec, 2013 16 commits
- Fixed the no_avatar.png path · a9d1038f
  Jeroen van Baarsen authored Dec 16, 2013
```
Fixes: https://github.com/gitlabhq/gitlabhq/issues/4394
```
  a9d1038f
- Merge branch 'feature/project_in_mr_emails' of /home/git/repositories/gitlab/gitlabhq · dea02363
  Dmitriy Zaporozhets authored Dec 16, 2013
  
  dea02363
- Merge branch 'improve/repo_head_update' · 80c4657f
  Dmitriy Zaporozhets authored Dec 16, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/project.rb
```
  80c4657f
- Improve UI/UX for reset_password, signup, confirmation pages · 42003f53
  Dmitriy Zaporozhets authored Dec 16, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  42003f53
- Add resend-confirmation-link to sign-in page · 6f556d8e
  Dmitriy Zaporozhets authored Dec 16, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6f556d8e
- Improve email with confirmation instructions · 687cf48e
  Dmitriy Zaporozhets authored Dec 16, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  687cf48e
- Style devise error messages · 84f96137
  Dmitriy Zaporozhets authored Dec 16, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  84f96137
- Merge pull request #5841 from Popl7/archiving_old_projects · f40ad6ce
  Dmitriy Zaporozhets authored Dec 16, 2013
```
Archiving old projects for feature request
```
  f40ad6ce
- Merge pull request #5843 from bke-drewb/fix/dashboard_event_updates · ca29617d
  Dmitriy Zaporozhets authored Dec 16, 2013
```
Fix dashboard event caching
```
  ca29617d
- Add @project variable to merge request emails · 0429740a
  Dmitriy Zaporozhets authored Dec 16, 2013
```
After this change project name appears in the top part of email when you
open/close/accept merge request.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0429740a
- Update repository head successively during project update · 28bb65f3
  Dmitriy Zaporozhets authored Dec 16, 2013
```
It prevents situation when async worker slowly updates HEAD and we show
old branch as repository HEAD in project settings
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  28bb65f3
- Archiving old projects; archived projects aren't shown on dashboard · 37383966
  Steven Thonus authored Nov 29, 2013
```
features for archive projects
abilities for archived project
other abilities for archive projects

only limit commits and merges for archived projects

ability changed to prohibited actions on archived projects

added spec and feature tests for archive projects

changed search bar not to include archived projects
```
  37383966
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 99490159
  Dmitriy Zaporozhets authored Dec 16, 2013
  
  99490159
- Fixed db schema · 7060668e
  Dmitriy Zaporozhets authored Dec 16, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7060668e
- Merge pull request #5645 from sajanp/enhancement/install-guide · 911bf5f0
  Jacob Vosmaer authored Dec 16, 2013
```
Reorder steps to install web server before running gitlab:check
```
  911bf5f0
- Merge pull request #5617 from zeeZ/nginx-proxy · f24e1514
  Dmitriy Zaporozhets authored Dec 16, 2013
```
Add X-Forwarded-For to nginx config
```
  f24e1514