summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'star-fork-mobile' into 'master' Jacob Schatz2016-06-181-1/+1
|\
| * Display Star and Fork on mobile, fix #18537.star-fork-mobileConnor Shea2016-06-161-1/+1
* | Merge branch 'milestones-show-mrs' into 'master' Jacob Schatz2016-06-181-0/+7
|\ \
| * | Add merge request data to the progress information on Milestones pages.milestones-show-mrsConnor Shea2016-06-161-0/+7
* | | Merge branch 'comment-form-button-spacing' into 'master' Jacob Schatz2016-06-183-4/+4
|\ \ \
| * | | Fixed alignment of buttons in note formscomment-form-button-spacingPhil Hughes2016-06-173-4/+4
* | | | Merge branch 'dz-organize-admin-settings' into 'master' Jacob Schatz2016-06-183-64/+70
|\ \ \ \
| * | | | Move admin->runners tab as subnav of overview tabdz-organize-admin-settingsDmitriy Zaporozhets2016-06-163-64/+70
* | | | | 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 'issue_12758' into 'master' Douwe Maan2016-06-178-25/+84
|\ \ \ \ \
| * | | | | Small frontend code fixes and restore 8a2d88f commitFelipe Artur2016-06-172-7/+11
| * | | | | Merge master into issue_12758issue_12758Felipe Artur2016-06-1759-774/+945
| |\ \ \ \ \
| * | | | | | Allow users to set custom notifications in projects they don't own and severa...Felipe Artur2016-06-177-44/+9
| * | | | | | 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-171-1/+1
| * | | | | | 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-178-37/+78
| |\ \ \ \ \ \
| | * | | | | | Re-use notifications dropdown on user profileFelipe Artur2016-06-169-44/+50
| | * | | | | | Refactor custom notifications controller code and add specsFelipe Artur2016-06-141-2/+2
| | * | | | | | Remove schema from branch historyFelipe Artur2016-06-133-10/+56
| * | | | | | | Added description to custom option in notification dropdownPhil Hughes2016-06-161-5/+5
| * | | | | | | Implement custom notification level optionsFelipe Artur2016-06-153-10/+55
* | | | | | | | Merge branch 'fix-18717' into 'master' Douwe Maan2016-06-172-11/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Address Douwe's feedbackfix-18717Rémy Coutable2016-06-171-1/+1
| * | | | | | | | Ensure group/project owners can see their members' access_levelRémy Coutable2016-06-171-2/+1
| * | | | | | | | 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-181-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Removed update methodissuable-todo-improvementsPhil Hughes2016-06-171-1/+1
| * | | | | | | | Removed ID from button as frontend doesnt use anymorePhil Hughes2016-06-171-1/+1
| * | | | | | | | Improved manual todosPhil Hughes2016-06-171-5/+5
| |/ / / / / / /
* | | | | | | | Warn about admin privilege to disable GitHub WebhooksDouglas Barbosa Alexandre2016-06-171-1/+1
* | | | | | | | Merge branch 'commit-header' into 'master' Jacob Schatz2016-06-171-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed issue with dropdown buttonscommit-headerPhil Hughes2016-06-171-1/+1
| * | | | | | | | Use line-height instead of height.Jacob Schatz2016-06-171-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'disable-saml-account-unlink' into 'master' Robert Speicher2016-06-171-3/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Disable the unlink feature for SAML connected accounts (social login).Patricio Cano2016-06-141-3/+7
* | | | | | | | | Fixed issue with assignee dropdown not selecting correctlyPhil Hughes2016-06-171-1/+1
* | | | | | | | | Fix clibpoard buttons on "Check out branch" modal.clipboard-buttons-fixConnor Shea2016-06-171-3/+3
* | | | | | | | | Merge branch '18724-dont-show-leave-project-to-group-member' into 'master' Douwe Maan2016-06-171-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't show 'Leave Project' to group members18724-dont-show-leave-project-to-group-memberRémy Coutable2016-06-171-2/+3
* | | | | | | | | | Merge branch '14918-add-filter-dropdown-to-tag-page' into 'master' Rémy Coutable2016-06-171-2/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add sorting dropdown to tag page14918-add-filter-dropdown-to-tag-pageAlejandro Rodríguez2016-06-161-2/+13
* | | | | | | | | | | Merge branch 'feature/project-export' into 'master' Douwe Maan2016-06-178-2/+124
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | a few changes based on MR feedbackJames Lopez2016-06-172-2/+2
| * | | | | | | | | | fixed merge conflicts on UI branchJames Lopez2016-06-16114-1080/+1227
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| * | | | | | | | | | lots of refactoring again based on feedback. Changed the UI slightly and also...James Lopez2016-06-156-35/+53