summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tags-edit-tooltip-placement' into 'master' Jacob Schatz2016-06-181-1/+1
|\
| * Fixed tooltip placement on edit tags buttontags-edit-tooltip-placementPhil Hughes2016-06-171-1/+1
* | Merge branch 'branch-buttons-size' into 'master' Jacob Schatz2016-06-181-3/+3
|\ \
| * | Fixed size of buttons in branches listbranch-buttons-sizePhil Hughes2016-06-171-3/+3
| |/
* | Merge branch 'last-push-vertical-alignment' into 'master' Jacob Schatz2016-06-181-1/+2
|\ \
| * | Aligns create merge request button verticallylast-push-vertical-alignmentPhil Hughes2016-06-171-1/+2
| |/
* | Merge branch '18714_bulk_assign_labels_icon' into 'master' Jacob Schatz2016-06-182-0/+28
|\ \
| * | Fixes icon state when selecting issues that have the same labels assignedAlfredo Sumaran2016-06-162-0/+28
* | | Merge branch '18707-label-tooltips-dont-dissapear-firefox' into 'master' Jacob Schatz2016-06-181-0/+5
|\ \ \
| * | | Hide tooltip manually18707-label-tooltips-dont-dissapear-firefoxAlfredo Sumaran2016-06-161-0/+5
* | | | Merge branch 'issue_12758' into 'master' Douwe Maan2016-06-1721-147/+353
|\ \ \ \
| * | | | Small frontend code fixes and restore 8a2d88f commitFelipe Artur2016-06-172-7/+11
| * | | | Merge master into issue_12758issue_12758Felipe Artur2016-06-17132-1257/+1935
| |\ \ \ \
| * | | | | Allow users to set custom notifications in projects they don't own and severa...Felipe Artur2016-06-179-53/+22
| * | | | | 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-1719-138/+183
| |\ \ \ \ \
| | * | | | | Re-use notifications dropdown on user profileFelipe Artur2016-06-1620-145/+154
| | * | | | | Refactor custom notifications controller code and add specsFelipe Artur2016-06-144-19/+20
| | * | | | | Remove schema from branch historyFelipe Artur2016-06-1310-38/+169
| | * | | | | Improve notification settings event keys and add some specsFelipe Artur2016-06-132-44/+52
| | * | | | | Implement custom notification level optionsFelipe Artur2016-06-132-23/+62
| * | | | | | Added description to custom option in notification dropdownPhil Hughes2016-06-162-6/+8
| * | | | | | Implement custom notification level optionsFelipe Artur2016-06-1510-69/+247
* | | | | | | Merge branch 'fix-18717' into 'master' Douwe Maan2016-06-173-11/+18
|\ \ \ \ \ \ \
| * | | | | | | Address Douwe's feedbackfix-18717Rémy Coutable2016-06-172-3/+3
| * | | | | | | Ensure group/project owners can see their members' access_levelRémy Coutable2016-06-172-2/+7
| * | | | | | | Group owner cannot request access to a project of their groupRémy Coutable2016-06-171-9/+11
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'issuable-todo-improvements'Douwe Maan2016-06-185-27/+31
|\ \ \ \ \ \ \
| * | | | | | | Removed update methodissuable-todo-improvementsPhil Hughes2016-06-172-2/+2
| * | | | | | | Removed ID from button as frontend doesnt use anymorePhil Hughes2016-06-171-1/+1
| * | | | | | | Removed todo from JSON responsePhil Hughes2016-06-171-1/+0
| * | | | | | | Checks for current_user when getting todoPhil Hughes2016-06-171-1/+1
| * | | | | | | Correctly checks if user is logged in when adding todoPhil Hughes2016-06-171-1/+1
| * | | | | | | Improved manual todosPhil Hughes2016-06-175-27/+32
| |/ / / / / /
* | | | | | | Warn about admin privilege to disable GitHub WebhooksDouglas Barbosa Alexandre2016-06-171-1/+1
* | | | | | | 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-173-16/+11
|\ \ \ \ \ \ \
| * | | | | | | Ensure Todos counters doesn't count Todos for projects pending deleteDouglas Barbosa Alexandre2016-06-173-16/+11
* | | | | | | | Merge branch 'disable-saml-account-unlink' into 'master' Robert Speicher2016-06-172-4/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Disable the unlink feature for SAML connected accounts (social login).Patricio Cano2016-06-142-4/+8
* | | | | | | | | Merge branch 'repo-check-require-push-events' into 'master' Robert Speicher2016-06-171-1/+5
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Do not check repos without push eventsJacob Vosmaer2016-06-151-1/+5
* | | | | | | | | Merge branch '18034-cache-todo-counter' into 'master' Yorick Peterse2016-06-175-9/+36
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Cache todo counters (pending/done)18034-cache-todo-counterPaco Guzman2016-06-175-9/+36