summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Updated trusted proxies doc section to link to the restart GitLab docsconfigure_trusted_proxiesDJ Mountney2016-04-121-1/+2
* Add changelog entries, install docs, and gitlab.yml.example entry for the tru...DJ Mountney2016-04-123-0/+20
* Adjust the default trusted_proxies to only include localhost, and allow other...DJ Mountney2016-04-122-0/+3
* Merge branch 'fix_emojis_not_showing_in_autocomplete' into 'master' Robert Speicher2016-04-122-2/+2498
|\
| * fix emoji aliases not showing in autocompletefix_emojis_not_showing_in_autocompleteArinde Eniola2016-04-092-2/+2498
* | Merge branch 'member-access-note-row' into 'master' Jacob Schatz2016-04-121-6/+6
|\ \
| * | Fixed issue with member access not being visible on notesmember-access-note-rowPhil Hughes2016-04-081-6/+6
* | | Merge branch 'fix_quick_submit_missing_in_edit_merge_request' into 'master' Jacob Schatz2016-04-122-1/+22
|\ \ \
| * | | add some changes to the testfix_quick_submit_missing_in_edit_merge_requestArinde Eniola2016-04-071-11/+5
| * | | add testArinde Eniola2016-04-071-0/+27
| * | | fix quick submit missing in edit merge request pageArinde Eniola2016-04-071-1/+1
* | | | Merge branch 'admin-pages-layout-sass-update' into 'master' Jacob Schatz2016-04-121-3/+3
|\ \ \ \
| * | | | Updated meqia query for admin/groups search boxadmin-pages-layout-sass-updatePhil Hughes2016-04-071-3/+3
* | | | | Merge branch 'right-sidebar-link-hover' into 'master' Jacob Schatz2016-04-121-0/+6
|\ \ \ \ \
| * | | | | Fixed colour of dropdown link hoverright-sidebar-link-hoverPhil Hughes2016-04-071-0/+6
| |/ / / /
* | | | | Merge branch 'fix_labels_not_showing_in_todos' into 'master' Jacob Schatz2016-04-123-1/+16
|\ \ \ \ \
| * | | | | fix labels not showing on todos pagefix_labels_not_showing_in_todosArinde Eniola2016-04-063-1/+16
* | | | | | Merge branch 'decouple-member-notification' into 'master' Douwe Maan2016-04-1237-338/+447
|\ \ \ \ \ \
| * | | | | | Fix specs for Projects::NotificationSettingsControllerDouglas Barbosa Alexandre2016-04-121-28/+0
| * | | | | | Improve specs for group/project notification controllerdecouple-member-notificationDouglas Barbosa Alexandre2016-04-122-3/+53
| * | | | | | Simplify Projects::NotificationSettingsControllerDouglas Barbosa Alexandre2016-04-123-9/+2
| * | | | | | Fix partial for update project notificationsDouglas Barbosa Alexandre2016-04-111-1/+1
| * | | | | | Requires user to be signed in when changing notification settingsDouglas Barbosa Alexandre2016-04-114-0/+52
| * | | | | | Reuse `User#notification_settings_for` when it's possibleDouglas Barbosa Alexandre2016-04-115-10/+9
| * | | | | | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-11119-588/+1169
| |\ \ \ \ \ \
| * | | | | | | Use Hash instead of Array on NotificationSetting#level enumDouglas Barbosa Alexandre2016-04-111-3/+1
| * | | | | | | Fix schema.rbDouglas Barbosa Alexandre2016-04-081-4/+4
| * | | | | | | Fix CHANGELOGDouglas Barbosa Alexandre2016-04-081-4/+0
| * | | | | | | Update gitlab-shell to 2.7.2Yorick Peterse2016-04-081-1/+1
| * | | | | | | Add method to return the user notification setting for a group, or a projectDouglas Barbosa Alexandre2016-04-082-1/+5
| * | | | | | | Use default_value_for to set default NotificationSetting#levelDouglas Barbosa Alexandre2016-04-082-9/+6
| * | | | | | | 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
View Lorry Controller Status