summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | Use singular resource for NotificationSettingDouglas Barbosa Alexandre2016-04-081-2/+2
| * | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update migration commentDmitriy Zaporozhets2016-03-301-2/+6
| * | | | | | | | | | | | Test changing notification settings per project fron notificaitons pageDmitriy Zaporozhets2016-03-302-0/+16
| * | | | | | | | | | | | Add changelog itemDmitriy Zaporozhets2016-03-301-0/+1
| * | | | | | | | | | | | Update API to use notification_level from notification_settingDmitriy Zaporozhets2016-03-301-5/+10
| * | | | | | | | | | | | Change how notification settings in profile are rendered and updatedDmitriy Zaporozhets2016-03-309-82/+89
| * | | | | | | | | | | | Improve project notification settings explanationDmitriy Zaporozhets2016-03-301-1/+1
| * | | | | | | | | | | | Create NotificationSettings object only when user change value in dropdownDmitriy Zaporozhets2016-03-305-5/+35
| * | | | | | | | | | | | Fix few bugs related to recent notifications refactoringDmitriy Zaporozhets2016-03-302-2/+1
| * | | | | | | | | | | | Refactor creating notification setting with defaultsDmitriy Zaporozhets2016-03-303-12/+13
| * | | | | | | | | | | | Add spec for user_id uniq in NotificationSetting modelDmitriy Zaporozhets2016-03-301-1/+2
| * | | | | | | | | | | | Remove useless Notification modelDmitriy Zaporozhets2016-03-304-28/+17
| * | | | | | | | | | | | Refactor notification helper and fix notification serviceDmitriy Zaporozhets2016-03-303-37/+14
| * | | | | | | | | | | | Improve db migrations for notification settingsDmitriy Zaporozhets2016-03-303-14/+13
| * | | | | | | | | | | | Small refactoring and cleanup of notification logicDmitriy Zaporozhets2016-03-307-64/+8
| * | | | | | | | | | | | Update NotificationService to use NotificationSettings instead of membershipDmitriy Zaporozhets2016-03-308-67/+40
| * | | | | | | | | | | | Create notification setting when membership createdDmitriy Zaporozhets2016-03-301-0/+10
| * | | | | | | | | | | | Introduce NotificationSetting to user interfaceDmitriy Zaporozhets2016-03-3010-93/+106
| * | | | | | | | | | | | Migrate notification setting from members tableDmitriy Zaporozhets2016-03-303-1/+23
| * | | | | | | | | | | | Introduce NotificationSetting modelDmitriy Zaporozhets2016-03-304-3/+53
* | | | | | | | | | | | | Merge branch 'commit-message-prefilled' into 'master' Jacob Schatz2016-04-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | 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
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'build-notification-fixes' into 'master' Jacob Schatz2016-04-124-13/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | 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
* | | | | | | | | | | | | | Merge branch 'fix-missing-saml-error-handling' into 'master' Robert Speicher2016-04-122-11/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Changelog entry for service class instrumentationYorick Peterse2016-04-121-0/+1
| * | | | | | | | | | | | | | | | Instrument all service classesinstrument-service-classesYorick Peterse2016-04-121-0/+12
* | | | | | | | | | | | | | | | | 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 groupArinde Eniola2016-04-124-4/+27
* | | | | | | | | | | | | | | | | | Merge branch 'api-delete-note' into 'master' Rémy Coutable2016-04-127-2/+244
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \