Commits · 877f56c9370eef9affef3cc3438c5d4fe11b123c · Jérome Perrin / gitlab-ce

30 Mar, 2016 24 commits
- Merge branch 'master' into decouple-member-notification · 877f56c9
  Dmitriy Zaporozhets authored Mar 30, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  877f56c9
- Update migration comment · 1a293a43
  Dmitriy Zaporozhets authored Mar 30, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1a293a43
- Test changing notification settings per project fron notificaitons page · 065faac3
  Dmitriy Zaporozhets authored Mar 30, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  065faac3
- Add changelog item · 49f9873c
  Dmitriy Zaporozhets authored Mar 29, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  49f9873c
- Update API to use notification_level from notification_setting · 949431fa
  Dmitriy Zaporozhets authored Mar 29, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  949431fa
- Change how notification settings in profile are rendered and updated · 26631f99
  Dmitriy Zaporozhets authored Mar 29, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  26631f99
- Improve project notification settings explanation · 729fe42b
  Dmitriy Zaporozhets authored Mar 29, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  729fe42b
- Create NotificationSettings object only when user change value in dropdown · 5583197e
  Dmitriy Zaporozhets authored Mar 29, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5583197e
- Fix few bugs related to recent notifications refactoring · f8f68d6b
  Dmitriy Zaporozhets authored Mar 29, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f8f68d6b
- Refactor creating notification setting with defaults · 71e7b398
  Dmitriy Zaporozhets authored Mar 29, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  71e7b398
- Add spec for user_id uniq in NotificationSetting model · 630c86a7
  Dmitriy Zaporozhets authored Mar 29, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  630c86a7
- Remove useless Notification model · 86418c47
  Dmitriy Zaporozhets authored Mar 29, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  86418c47
- Refactor notification helper and fix notification service · 08b3d7f6
  Dmitriy Zaporozhets authored Mar 29, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  08b3d7f6
- Improve db migrations for notification settings · 855b2820
  Dmitriy Zaporozhets authored Mar 28, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  855b2820
- Small refactoring and cleanup of notification logic · 4ca73f56
  Dmitriy Zaporozhets authored Mar 28, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4ca73f56
- Update NotificationService to use NotificationSettings instead of membership · b8f38437
  Dmitriy Zaporozhets authored Mar 28, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b8f38437
- Create notification setting when membership created · 7ea1bcab
  Dmitriy Zaporozhets authored Mar 28, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7ea1bcab
- Introduce NotificationSetting to user interface · 359157c0
  Dmitriy Zaporozhets authored Mar 28, 2016
```
* visiting project will create notification setting if missing
* change notification setting per project even without membership
* use notification settings instead of membership on profile page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  359157c0
- Migrate notification setting from members table · 73c5a341
  Dmitriy Zaporozhets authored Mar 28, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  73c5a341
- Introduce NotificationSetting model · 31b0e530
  Dmitriy Zaporozhets authored Mar 28, 2016
```
It will hold notification setting per group or per project. It will
allow get rid of notification level stored in Member model
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  31b0e530
- Merge branch 'notification-settings-save' into 'master' · 7b2af874
  Rémy Coutable authored Mar 30, 2016
```
Fixed issue with notification settings not saving

Closes #14736

See merge request !3452
```
  7b2af874
- Fixed issue with notification settings not saving · 0a7974e5
  Phil Hughes authored Mar 30, 2016
```
Closes #14736
```
  0a7974e5
- Merge branch 'rs-banzai-requires' into 'master' · a9346cab
  Rémy Coutable authored Mar 30, 2016
```
Remove redundant `require`s from Banzai files

We're trying to avoid circular dependency errors.

Related: https://gitlab.com/gitlab-org/gitlab-ce/issues/13521

Sentry: https://sentry.gitlap.com/gitlab/gitlabcom/issues/8/

See merge request !3391
```
  a9346cab
- Merge branch 'added-milestone-upcoming' into 'master' · 4a439856
  Rémy Coutable authored Mar 30, 2016
```
Dropdown bug fixes

- Added back upcoming to milestone filter

![Screen_Shot_2016-03-23_at_16.45.22](/uploads/8c31eff7e0984aad17881f6397ff17cd/Screen_Shot_2016-03-23_at_16.45.22.png)

- Fixed bug that would cause the currently selected value to disappear on filters
- Fixed bug that throw an error when filtering by upcoming when there is only a milestone in the past

Closes #14536

See merge request !3368
```
  4a439856
29 Mar, 2016 16 commits
- Merge branch 'fix-mr-comment-commit-pruned' into 'master' · f7d20a6f
  Robert Speicher authored Mar 29, 2016
```
Gracefully handle notes on deleted commits in merge requests

Closes #3250

See merge request !3402
```
  f7d20a6f
- Merge branch 'mariusz_jachimowicz/gitlab-ce-i_14415_expose_label_description' into 'master' · 999ae7f7
  Robert Speicher authored Mar 29, 2016
```
api - expose label description

Resolves #14415

See merge request !3314
```
  999ae7f7
- Merge branch 'fix_wip_in_mr_api' into 'master' · a9f5df38
  Robert Speicher authored Mar 29, 2016
```
Ensuring Merge Request API returns boolean values for work_in_progress

Fixes #14692.

See merge request !3432
```
  a9f5df38
- Spec updates · 6a3d8ac2
  Phil Hughes authored Mar 29, 2016
  
  6a3d8ac2
- Merge branch 'handle-nil-description-slack-message' into 'master' · b1f924c1
  Robert Speicher authored Mar 29, 2016
```
Handle nil descriptions in Slack issue messages

Closes #14676

See merge request !3420
```
  b1f924c1
- Merge branch 'gitlab-shell-2.7' into 'master' · c19195f4
  Robert Speicher authored Mar 29, 2016
```
Updated gitlab-shell to 2.7

This is done to include the changes introduced in
https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/42.

See merge request !3437
```
  c19195f4
- Updated based on Ruby feedback · 31fea922
  Phil Hughes authored Mar 29, 2016
  
  31fea922
- Updated gitlab-shell to 2.7 · 67be43e6
  Yorick Peterse authored Mar 29, 2016
```
This is done to include the changes introduced in
https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/42.
```
  67be43e6
- Ruby fixes · b5ece088
  Phil Hughes authored Mar 29, 2016
  
  b5ece088
- Fixed multiselect · 35b3c709
  Phil Hughes authored Mar 29, 2016
  
  35b3c709
- Fixed rubocop issues · f8b5ff95
  Phil Hughes authored Mar 24, 2016
  
  f8b5ff95
- Fixed issue with milestone not being un-selectable · f3b162a9
  Phil Hughes authored Mar 24, 2016
  
  f3b162a9
- Standardised the output of the JSON to always include the name · 88024b17
  Phil Hughes authored Mar 24, 2016
```
The frontend will then always use the name as the ID - like previous
```
  88024b17
- Merge branch 'rs-fix-migrations' into 'master' · 54957d69
  Dmitriy Zaporozhets authored Mar 29, 2016
```
Use raw SQL instead of Rails models in migrations where appropriate

Closes #14694.

See merge request !3429
```
  54957d69
- Removed un-used code · 3aeda8c9
  Phil Hughes authored Mar 24, 2016
  
  3aeda8c9
- Updated to only include upcoming on filters · a6d7c695
  Phil Hughes authored Mar 24, 2016
```
Fixes tests
```
  a6d7c695