summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Preserve selected versions when comparing MR changes25836-changing-from-version-in-diff-comparison-does-not-preserve-to-versionSam Rose2016-12-313-2/+51
|
* Merge branch '22072-enable-haml-lints' into 'master' Alfredo Sumaran2016-12-31217-645/+634
|\ | | | | | | | | | | | | Enable HAML-LINT linters Closes #22072 See merge request !8247
| * HAMLLint: Fix `ImplicitDiv` offence post-rebase22072-enable-haml-lintsKushal Pandya2016-12-311-1/+1
| |
| * HAMLLint: Fix `TrailingWhitespace` offense post-rebaseKushal Pandya2016-12-311-1/+1
| |
| * HAMLLint: Fix `SpaceInsideHashAttributes` offenceKushal Pandya2016-12-311-1/+1
| |
| * HAMLLint: Fix `SpaceInsideHashAttributes` offencesKushal Pandya2016-12-31157-521/+514
| |
| * HAMLLint: Enable `SpaceInsideHashAttributes` ruleKushal Pandya2016-12-311-1/+1
| |
| * HAMLLint: Fix `TrailingWhitespace` offencesKushal Pandya2016-12-319-14/+12
| |
| * HAMLLint: Enable `TrailingWhitespace` ruleKushal Pandya2016-12-311-1/+1
| |
| * HAMLLint: Fix `SpaceBeforeScript` offencesKushal Pandya2016-12-3114-14/+14
| |
| * HAMLLint: Enable `SpaceBeforeScript` ruleKushal Pandya2016-12-311-1/+1
| |
| * HAMLLint: Fix `ImplicitDiv` offencesKushal Pandya2016-12-3141-52/+50
| |
| * HAMLLint: Enable `ImplicitDiv` ruleKushal Pandya2016-12-311-1/+1
| |
| * HAMLLint: Fix `HtmlAttributes` offencesKushal Pandya2016-12-314-8/+8
| |
| * HAMLLint: Enable `HtmlAttributes` ruleKushal Pandya2016-12-311-1/+1
| |
| * HAMLLint: Fix `FinalNewline` offencesKushal Pandya2016-12-316-6/+6
| |
| * HAMLLint: Enable `FinalNewline` ruleKushal Pandya2016-12-311-1/+1
| |
| * HAMLLint: Fix `ClassAttributeWithStaticValue` offencesKushal Pandya2016-12-3117-26/+26
| |
| * HAMLLint: Enable `ClassAttributeWithStaticValue` ruleKushal Pandya2016-12-311-1/+1
| |
| * HAMLLint: fix `AltText` offencesKushal Pandya2016-12-317-18/+18
| |
| * HAMLLint: Enable `AltText` ruleKushal Pandya2016-12-311-1/+1
|/
* Merge branch '18556-polish-up-the-u2f-flow' into 'master' 26172-stages-icons-on-pipelines-page-skewedFatih Acet2016-12-307-83/+127
|\ | | | | | | | | | | | | Improved the u2f flow Closes #18556 See merge request !8304
| * Improved the u2f flow18556-polish-up-the-u2f-flowLuke "Jared" Bennett2016-12-277-83/+127
| | | | | | | | 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 'fix-default-sort-order-spec-failures' into 'master' Sean McGivern2016-12-301-8/+2
|\ \ \ | | | | | | | | | | | | | | | | Fix failures in default sort order spec See merge request !8379
| * | | Fix failures in default sort order specAdam Niedzielski2016-12-301-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test cases were not waiting for page load after clicking. This caused failures in test cases that were executed right after these incorrect ones, because of requests hitting server after a test was finished. We do not have to click links, we can go directly to a correct page by passing parameters in the URL.
* | | | Merge branch 'issue_25578' into 'master' Sean McGivern2016-12-303-2/+36
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 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-293-2/+36
| | | |
* | | | Merge branch 'feature/admin-merge-groups-and-projects' into 'master' Sean McGivern2016-12-308-32/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-298-32/+34
| | | | |
* | | | | Merge branch 'fix-boards-search-typo' into 'master' Sean McGivern2016-12-304-5/+9
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Fix boards search typo See merge request !8370
| * | | | Fix typo: seach to searchfix-boards-search-typovictorwu2016-12-294-5/+9
|/ / / /
* | | | 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-292-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes too short input for placeholder message in commit listing page Closes #26192 See merge request !8367
| * | | | changelog file added26192-fixes-too-short-inputNur Rony2016-12-291-0/+4
| | | | |
| * | | | 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-293-5/+9
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Move award emoji's out of the discussion tab for merge requests Closes #25996 See merge request !8358
| * | | | Fix MR versions spec25996-Move-award-emoji-out-of-the-discussion-tab-for-MRAnnabel Dunstone Gray2016-12-291-2/+2
| | | | |
| * | | | Move award emoji's out of the discussion tab for merge requestsdimitrieh2016-12-282-3/+7
| | | | |
* | | | | Merge branch 'issue_25682' into 'master' Sean McGivern2016-12-295-41/+52
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | 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-295-41/+52
| | | | |
* | | | | Merge branch '25829-update-username-button-remains-disabled-upon-failure' ↵Alfredo Sumaran2016-12-292-6/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Re-enable submit button after username change failure Closes #25829 See merge request !8332
| * | | | | add CHANGELOG.md entry for !833225829-update-username-button-remains-disabled-upon-failureMike Greiling2016-12-291-0/+4
| | | | | |
| * | | | | re-enable submit button after username change failureMike Greiling2016-12-271-6/+3
| | | | | |
* | | | | | Merge branch 'dz-nested-group-misc' into 'master' Dmitriy Zaporozhets2016-12-296-4/+62
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Miscellaneous improvements to the nested groups feature See merge request !8308
| * | | | | | Refactor nested group related codedz-nested-group-miscDmitriy Zaporozhets2016-12-293-14/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-264-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Add nested groups support to the Groups::CreateServiceDmitriy Zaporozhets2016-12-262-4/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'grapify-settings-api' into 'master' Sean McGivern2016-12-293-14/+108
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify the settings API See merge request !8336
| * | | | | | | Grapify the settings APIgrapify-settings-apiRobert Schilling2016-12-293-14/+108
| | | | | | | |
View Lorry Controller Status