summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Make diff discussion more reliablefix_broken_diff_discussionsValery Sizov2016-12-301-3/+5
* Merge branch 'feature/admin-merge-groups-and-projects' into 'master' Sean McGivern2016-12-305-31/+13
|\
| * Merged the 'groups' and 'projects' tabs when viewing user profilesJames Gregory2016-12-295-31/+13
* | Fix typo: seach to searchfix-boards-search-typovictorwu2016-12-292-2/+2
|/
* Merge branch '26192-fixes-too-short-input' into 'master' 23892-completing-an-item-in-a-task-list-removes-the-todo-flag-from-a-ticketFatih Acet2016-12-291-0/+6
|\
| * fixes too short input for placeholder message in commit listing pageNur Rony2016-12-291-0/+6
* | Merge branch '25996-Move-award-emoji-out-of-the-discussion-tab-for-MR' into '...Fatih Acet2016-12-291-3/+3
|\ \
| * | Move award emoji's out of the discussion tab for merge requestsdimitrieh2016-12-281-3/+3
* | | Merge branch 'issue_25682' into 'master' Sean McGivern2016-12-292-40/+26
|\ \ \
| * | | Parse JIRA issue references even if Issue Tracker is disabledFelipe Artur2016-12-292-40/+26
* | | | Merge branch '25829-update-username-button-remains-disabled-upon-failure' int...Alfredo Sumaran2016-12-291-6/+3
|\ \ \ \
| * | | | re-enable submit button after username change failureMike Greiling2016-12-271-6/+3
* | | | | Merge branch 'dz-nested-group-misc' into 'master' Dmitriy Zaporozhets2016-12-293-0/+18
|\ \ \ \ \
| * | | | | Refactor nested group related codedz-nested-group-miscDmitriy Zaporozhets2016-12-292-13/+6
| * | | | | Show nested groups tab on group pageDmitriy Zaporozhets2016-12-262-0/+12
| * | | | | Add nested groups support to the Groups::CreateServiceDmitriy Zaporozhets2016-12-261-0/+13
* | | | | | Merge branch '25925-fix-tag-sorting-and-filtering-options' into 'master' Annabel Dunstone Gray2016-12-294-37/+51
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Set default sort for tags to Last updated25925-fix-tag-sorting-and-filtering-optionsSam Rose2016-12-284-37/+51
* | | | | | Merge branch '26134-ctrl-enter-does-not-submit-a-new-merge-request' into 'mas...Sean McGivern2016-12-291-1/+1
|\ \ \ \ \ \
| * | | | | | CTRL+Enter does not submit a new merge requestSaad Shahd2016-12-291-1/+1
* | | | | | | Merge branch 'view-ce-vs-ee' into 'master' Sean McGivern2016-12-293-0/+18
|\ \ \ \ \ \ \
| * | | | | | | About GitLab link in sidebar that links to help pageview-ce-vs-eevictorwu2016-12-283-0/+18
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'issue_22664' into 'master' Sean McGivern2016-12-294-22/+32
|\ \ \ \ \ \ \
| * | | | | | | Check if user can read issue before being assignedissue_22664Felipe Artur2016-12-274-23/+32
| * | | | | | | Fix issuable assignee update bug when previous assignee is nullFelipe Artur2016-12-201-3/+4
* | | | | | | | Merge branch 'mentioned-but-not-closed-issues-messages' into 'master' Sean McGivern2016-12-291-5/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | use MergeRequest#closes_issues instead of rewriting code to retrieve closing ...Gabriel Gizotti2016-12-281-5/+1
* | | | | | | | Merge branch 'dz-nested-group-access' into 'master' Dmitriy Zaporozhets2016-12-293-6/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve Group#users_with_parents methoddz-nested-group-accessDmitriy Zaporozhets2016-12-291-1/+1
| | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Include group parents into read access for project and groupDmitriy Zaporozhets2016-12-263-6/+16
* | | | | | | | Merge branch '24941-login-tabs-border' into 'master' Alfredo Sumaran2016-12-281-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | fix left border in session tabsMike Greiling2016-12-281-2/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch '24820-buttons-in-the-branches-page-are-stacking-on-top-of-each-...Alfredo Sumaran2016-12-282-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | change chevron position for branch sort order dropdown menuMike Greiling2016-12-281-1/+1
| * | | | | | | | fix mobile view for branch index headerMike Greiling2016-12-281-0/+4
| * | | | | | | | allow header buttons to take more than 50% of the screen widthMike Greiling2016-12-281-1/+1
* | | | | | | | | Merge branch '24876-page-jumps-to-wrong-position-when-clicking-a-comment-anch...Alfredo Sumaran2016-12-281-0/+8
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | limit body click selector to tags with a hash target24876-page-jumps-to-wrong-position-when-clicking-a-comment-anchorMike Greiling2016-12-281-2/+2
| * | | | | | | | don't take for granted that all anchor tags have an href attributeMike Greiling2016-12-281-1/+1
| * | | | | | | | move body click binding inside the onready callbackMike Greiling2016-12-281-8/+8
| * | | | | | | | catch instances where hashchange event is not fired yet we still want to adju...Mike Greiling2016-12-281-0/+8
| |/ / / / / / /
* | | | | | | | Merge branch 'gfm-new-line-fix' into 'master' Fatih Acet2016-12-281-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix GFM dropdown not showing at beginning of new linesgfm-new-line-fixPhil Hughes2016-12-281-1/+1
* | | | | | | | | Merge branch '26153-refactor-line-length' into 'master' Fatih Acet2016-12-282-49/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Refactor line length cssAnnabel Dunstone Gray2016-12-282-49/+4
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '25957-marking-a-diff-discussion-as-resolved-doesn-t-update-tool...Fatih Acet2016-12-281-4/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Defer tooltip update on Resolve Comment button after DOM cycleSam Rose2016-12-281-4/+6
* | | | | | | | | | Merge branch '25430-make-colors-in-runner-status-more-colorblind-friendly' in...Annabel Dunstone Gray2016-12-281-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Change status colors of runners to better defaults25430-make-colors-in-runner-status-more-colorblind-friendlydimitrieh2016-12-271-3/+3
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '21135-resolve-these-conflicts-link-is-too-subtle' into 'master' Sean McGivern2016-12-281-14/+16
|\ \ \ \ \ \ \ \ \ \