summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove explicit Gitlab::Metrics.action assignments, are already automatic.18760-remove-explicate-assignment-on-metrics-actionPaco Guzman2016-06-182-2/+1
* Merge branch 'issue_12758' into 'master' Douwe Maan2016-06-1734-249/+643
|\
| * Small frontend code fixes and restore 8a2d88f commitFelipe Artur2016-06-172-7/+11
| * Merge master into issue_12758issue_12758Felipe Artur2016-06-17208-1565/+11605
| |\
| * | Allow users to set custom notifications in projects they don't own and severa...Felipe Artur2016-06-1712-59/+24
| * | Fixed bug with label clicking in modal not workingPhil Hughes2016-06-171-4/+3
| * | Fixed bug with clicking custom again not opening modalPhil Hughes2016-06-172-1/+4
| * | Description for custom in dropdownPhil Hughes2016-06-171-5/+5
| * | Fixed alignment of notification dropdown menuPhil Hughes2016-06-173-4/+6
| * | Re-use notifications dropdown/modal for user profileFelipe Artur2016-06-1727-263/+418
| |\ \
| | * | Re-use notifications dropdown on user profileFelipe Artur2016-06-1625-264/+361
| | * | Update migration to match current schema versionFelipe Artur2016-06-141-0/+0
| | * | Refactor custom notifications controller code and add specsFelipe Artur2016-06-147-20/+65
| | * | Remove schema from branch historyFelipe Artur2016-06-1311-39/+170
| | * | Add notification settings documentation and update screenshotFelipe Artur2016-06-133-2/+5
| | * | Expose notification setting events in APIFelipe Artur2016-06-132-6/+26
| | * | Improve notification settings event keys and add some specsFelipe Artur2016-06-133-50/+102
| | * | Implement custom notification level optionsFelipe Artur2016-06-133-23/+69
| * | | Added description to custom option in notification dropdownPhil Hughes2016-06-162-6/+8
| * | | Implement custom notification level optionsFelipe Artur2016-06-1518-78/+354
* | | | Merge branch 'fix-18717' into 'master' Douwe Maan2016-06-176-11/+137
|\ \ \ \
| * | | | Address Douwe's feedbackfix-18717Rémy Coutable2016-06-174-20/+53
| * | | | Ensure group/project owners can see their members' access_levelRémy Coutable2016-06-173-2/+55
| * | | | Group owner cannot request access to a project of their groupRémy Coutable2016-06-173-9/+49
* | | | | Merge branch 'issuable-todo-improvements'Douwe Maan2016-06-188-28/+144
|\ \ \ \ \
| * | | | | Removed update methodissuable-todo-improvementsPhil Hughes2016-06-174-89/+83
| * | | | | Removed ID from button as frontend doesnt use anymorePhil Hughes2016-06-171-1/+1
| * | | | | Removed todo from JSON responsePhil Hughes2016-06-171-1/+0
| * | | | | Added todo controller tests for merge requestsPhil Hughes2016-06-171-37/+90
| * | | | | Checks for current_user when getting todoPhil Hughes2016-06-171-1/+1
| * | | | | Correctly checks if user is logged in when adding todoPhil Hughes2016-06-172-1/+14
| * | | | | Improved manual todosPhil Hughes2016-06-178-28/+85
| |/ / / /
* | | | | Merge branch 'gh-webhooks' into 'master' Robert Speicher2016-06-172-6/+19
|\ \ \ \ \
| * | | | | Warn about admin privilege to disable GitHub WebhooksDouglas Barbosa Alexandre2016-06-171-1/+1
| * | | | | Listing GH Webhooks doesn't stop import process for non GH admin usersDouglas Barbosa Alexandre2016-06-171-5/+18
* | | | | | Merge branch 'api-endpoints-award-emoji' into 'master' Robert Speicher2016-06-178-30/+722
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fixup! updated docs for api endpoint award emojiZ.J. van de Weg2016-06-173-24/+188
| * | | | | Add endpoints for award emoji on notesZ.J. van de Weg2016-06-174-74/+341
| * | | | | Sort API endpoints and implement feedbackZ.J. van de Weg2016-06-175-35/+41
| * | | | | Add endpoints for Award EmojiZ.J. van de Weg2016-06-175-1/+256
* | | | | | Merge branch 'commit-header' into 'master' Jacob Schatz2016-06-172-2/+4
|\ \ \ \ \ \
| * | | | | | Fixed issue with dropdown buttonscommit-headerPhil Hughes2016-06-171-1/+1
| * | | | | | Use line-height instead of height.Jacob Schatz2016-06-172-3/+3
| * | | | | | Fixes header vertical centering.Jacob Schatz2016-06-171-0/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'fix-todos-counters' into 'master' Robert Speicher2016-06-177-23/+51
|\ \ \ \ \ \
| * | | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-06-171-0/+1
| * | | | | | Ensure Todos counters doesn't count Todos for projects pending deleteDouglas Barbosa Alexandre2016-06-176-23/+50
* | | | | | | Merge branch 'disable-saml-account-unlink' into 'master' Robert Speicher2016-06-174-4/+35
|\ \ \ \ \ \ \
| * | | | | | | Added CHANGELOG item and fixed Rubocop errorsdisable-saml-account-unlinkPatricio Cano2016-06-142-4/+3
| * | | | | | | Disable the unlink feature for SAML connected accounts (social login).Patricio Cano2016-06-143-4/+36
View Lorry Controller Status