summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* HAMLLint: Fix `SpaceInsideHashAttributes` offencesKushal Pandya2016-12-31157-521/+514
|
* HAMLLint: Fix `TrailingWhitespace` offencesKushal Pandya2016-12-319-14/+12
|
* HAMLLint: Fix `SpaceBeforeScript` offencesKushal Pandya2016-12-3114-14/+14
|
* HAMLLint: Fix `ImplicitDiv` offencesKushal Pandya2016-12-3141-52/+50
|
* HAMLLint: Fix `HtmlAttributes` offencesKushal Pandya2016-12-314-8/+8
|
* HAMLLint: Fix `FinalNewline` offencesKushal Pandya2016-12-316-6/+6
|
* HAMLLint: Fix `ClassAttributeWithStaticValue` offencesKushal Pandya2016-12-3117-26/+26
|
* HAMLLint: fix `AltText` offencesKushal Pandya2016-12-317-18/+18
|
* Merge branch '18556-polish-up-the-u2f-flow' into 'master' 26172-stages-icons-on-pipelines-page-skewedFatih Acet2016-12-304-28/+37
|\ | | | | | | | | | | | | Improved the u2f flow Closes #18556 See merge request !8304
| * Improved the u2f flow18556-polish-up-the-u2f-flowLuke "Jared" Bennett2016-12-274-28/+37
| | | | | | | | Added tests
* | Merge branch '26201-sticky-tabs' into 'master' Fatih Acet2016-12-301-0/+4
|\ \ | | | | | | | | | | | | | | | | | | Make tabs full-width at small viewport Closes #26201 See merge request !8369
| * | Make tabs full-width at small viewport26201-sticky-tabsAnnabel Dunstone Gray2016-12-291-0/+4
| | |
* | | Merge branch 'issue_25578' into 'master' Sean McGivern2016-12-301-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix redirect after update file when user has forked project Closes #25578 See merge request !8371
| * | | Fix redirect after update file when user has forked projectFelipe Artur2016-12-291-1/+1
| | | |
* | | | 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 profiles Closes #24752 See merge request !8323
| * | | | 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 page Closes #26192 See merge request !8367
| * | | | 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
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Move award emoji's out of the discussion tab for merge requests Closes #25996 See merge request !8358
| * | | | 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 disabled Closes #25682 See merge request !8238
| * | | | 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' ↵Alfredo Sumaran2016-12-291-6/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Re-enable submit button after username change failure Closes #25829 See merge request !8332
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Miscellaneous improvements to the nested groups feature See merge request !8308
| * | | | | | Refactor nested group related codedz-nested-group-miscDmitriy Zaporozhets2016-12-292-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Simplify code around group parent access check * Rename 'Nested groups' to 'Subgroups' tab at group#show page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Show nested groups tab on group pageDmitriy Zaporozhets2016-12-262-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Add nested groups support to the Groups::CreateServiceDmitriy Zaporozhets2016-12-261-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | 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 updated and fix nav controls spacing Closes #25925 See merge request !8263
| * | | | | | Set default sort for tags to Last updated25925-fix-tag-sorting-and-filtering-optionsSam Rose2016-12-284-37/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spacing between nav control elements Wrap navigation text on Tags list page
* | | | | | | Merge branch '26134-ctrl-enter-does-not-submit-a-new-merge-request' into ↵Sean McGivern2016-12-291-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' CTRL+Enter does not submit a new merge request Closes #26134 See merge request !8360
| * | | | | | | 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 page Closes #24479 See merge request !8316
| * | | | | | | | 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 project before being assigned to issue Closes #22664 See merge request !7980
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix unclear closing issue behaviour on Merge Request show page Closes #26152 See merge request !8345
| * | | | | | | | use MergeRequest#closes_issues instead of rewriting code to retrieve closing ↵Gabriel Gizotti2016-12-281-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issues on MergeRequest#issues_mentioned_but_not_closing
* | | | | | | | | Merge branch 'dz-nested-group-access' into 'master' Dmitriy Zaporozhets2016-12-293-6/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inherit permissions from parent group See merge request !8071
| * | | | | | | | | Improve Group#users_with_parents methoddz-nested-group-accessDmitriy Zaporozhets2016-12-291-1/+1
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Include group parents into read access for project and groupDmitriy Zaporozhets2016-12-263-6/+16
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch '24941-login-tabs-border' into 'master' Alfredo Sumaran2016-12-281-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix left border in session tabs Closes #24941 See merge request !8346
| * | | | | | | | fix left border in session tabsMike Greiling2016-12-281-2/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch ↵Alfredo Sumaran2016-12-282-2/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '24820-buttons-in-the-branches-page-are-stacking-on-top-of-each-other-depending-on-the-selected-filter' into 'master' Resolve "Buttons in the "Branches" page are stacking on top of each other depending on the selected filter" Closes #24820 See merge request !8074
| * | | | | | | | 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 ↵Alfredo Sumaran2016-12-281-0/+8
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '24876-page-jumps-to-wrong-position-when-clicking-a-comment-anchor' into 'master' Fix instances where clicking a comment anchor twice will scroll to the wrong position Closes #24876 See merge request !8046