summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | Use singular resource for NotificationSettingDouglas Barbosa Alexandre2016-04-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since a user cannot have multiple NotificationSettings records for one group/project we can use singular resource.
| * | | | | | | | | | Simplify query to retrieve NotificationSetting on controllersDouglas Barbosa Alexandre2016-04-082-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Use query instead of model on migrationsDouglas Barbosa Alexandre2016-04-081-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-08288-1571/+13810
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into decouple-member-notificationDmitriy Zaporozhets2016-03-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Update migration commentDmitriy Zaporozhets2016-03-301-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Test changing notification settings per project fron notificaitons pageDmitriy Zaporozhets2016-03-302-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Add changelog itemDmitriy Zaporozhets2016-03-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Update API to use notification_level from notification_settingDmitriy Zaporozhets2016-03-301-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Change how notification settings in profile are rendered and updatedDmitriy Zaporozhets2016-03-309-82/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Improve project notification settings explanationDmitriy Zaporozhets2016-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Create NotificationSettings object only when user change value in dropdownDmitriy Zaporozhets2016-03-305-5/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Fix few bugs related to recent notifications refactoringDmitriy Zaporozhets2016-03-302-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Refactor creating notification setting with defaultsDmitriy Zaporozhets2016-03-303-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Add spec for user_id uniq in NotificationSetting modelDmitriy Zaporozhets2016-03-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Remove useless Notification modelDmitriy Zaporozhets2016-03-304-28/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Refactor notification helper and fix notification serviceDmitriy Zaporozhets2016-03-303-37/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Improve db migrations for notification settingsDmitriy Zaporozhets2016-03-303-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Small refactoring and cleanup of notification logicDmitriy Zaporozhets2016-03-307-64/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Update NotificationService to use NotificationSettings instead of membershipDmitriy Zaporozhets2016-03-308-67/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Create notification setting when membership createdDmitriy Zaporozhets2016-03-301-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Introduce NotificationSetting to user interfaceDmitriy Zaporozhets2016-03-3010-93/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * | | | | | | | | | | | Migrate notification setting from members tableDmitriy Zaporozhets2016-03-303-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Introduce NotificationSetting modelDmitriy Zaporozhets2016-03-304-3/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | | | | | Merge branch 'commit-message-prefilled' into 'master' Jacob Schatz2016-04-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefills commit message in edit file See #14488 ![Screen_Shot_2016-04-06_at_10.18.06](/uploads/2ace2a21a6ead8d83c79ef9ce5dd34cc/Screen_Shot_2016-04-06_at_10.18.06.png) See merge request !3564
| * | | | | | | | | | | | | Added back text used on merge commit messagecommit-message-prefilledPhil Hughes2016-04-111-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Prefills commit message in edit filePhil Hughes2016-04-111-1/+1
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See #14488
* | | | | | | | | | | | | Merge branch 'build-notification-fixes' into 'master' Jacob Schatz2016-04-124-13/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build notification null check Cancels build notification interval on page change See merge request !3540
| * | | | | | | | | | | | | Fixed failing testsbuild-notification-fixesPhil Hughes2016-04-111-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed missed conflictPhil Hughes2016-04-111-4/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Preparing build textPhil Hughes2016-04-112-4/+21
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Hides notification after X amount of secondsPhil Hughes2016-04-111-0/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Corrects the button color on build status changePhil Hughes2016-04-111-1/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Rubocop fixPhil Hughes2016-04-111-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Preparing build statusPhil Hughes2016-04-111-0/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Build notification null checkPhil Hughes2016-04-112-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cancels build notification interval on page change
* | | | | | | | | | | | | | Merge branch 'fix-missing-saml-error-handling' into 'master' Robert Speicher2016-04-122-11/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add proper nil and error handling to SAML login process While writing the feature that would allow certain Omniauth providers to be marked as external I noticed that there is a scenario where the `gl_user` method can return `nil` and if this is not properly checked, it will lead to exceptions that will cause 500 errors. It is quite easy to land in this scenario, so I added `nil` checks. I also noticed that the `saml` method in the `omniauth_callbacks_controller.rb` file lacked a `rescue` for `Gitlab::OAuth::SignupDisabledError`, which can happen if the default configuration from `1_settings.rb` is applied. So I also added this check. See merge request !3609
| * | | | | | | | | | | | | | Better control flow and added guard clause.fix-missing-saml-error-handlingPatricio Cano2016-04-111-14/+9
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add missing proper nil and error handling to SAML login process.Patricio Cano2016-04-072-18/+30
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'feature/fix-14753' into 'master' Rémy Coutable2016-04-122-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #14753: Check if head is born before trying to detect main language This MR makes sure that head exists before trying to detect the main language. This prevents errors on repo's without a master branch. Closes #14753 See merge request !3654
| * | | | | | | | | | | | | | | Add my nameJeroen Bobbeldijk2016-04-121-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Dont return nullJeroen Bobbeldijk2016-04-111-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add changelog, change code to guard clauseJeroen Bobbeldijk2016-04-112-3/+6
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Check head unborn in ruggedJeroen Bobbeldijk2016-04-111-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'instrument-service-classes' into 'master' Rémy Coutable2016-04-122-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instrument all service classes This will help us see where (mostly) Sidekiq code is spending time. See merge request !3675
| * | | | | | | | | | | | | | | | Changelog entry for service class instrumentationYorick Peterse2016-04-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | | Instrument all service classesinstrument-service-classesYorick Peterse2016-04-121-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#15162
* | | | | | | | | | | | | | | | | Merge branch 'hide_help_block_when_creating_project_inside_group' into 'master' Rémy Coutable2016-04-124-4/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide help block when user is creating a new project inside a group closes #14092 ![fix](/uploads/13721117c410c8fe6937d44a3b0a90a8/fix.gif) See merge request !3427
| * | | | | | | | | | | | | | | | | hide help block when user is creating a new project inside a groupArinde Eniola2016-04-124-4/+27
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'api-delete-note' into 'master' Rémy Coutable2016-04-127-2/+244
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete notes via API Supports deleting issues, snippets, and merge requests via the API. * Closes #14944 * Closes #14845 * Closes #6060 @zj I did not see that you assigned yourself in #6060. Hopefully, you did not start yet. @rymai In #6060 this is targeted for 8.7 release. Could you review that and maybe this still lands in 8.7. See merge request !3557