summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Strip trailing whitespaces in submodule URLssh-fix-submodules-trailing-spacesStan Hu2017-05-293-0/+10
| | | | | | | | Users attempting to access repositories that had `.gitmodules` entries with trailing whitespaces would encounter an Error 500. This was due to a change in bf876ec7 that quietly removed the whitespace stripping. Closes #33018
* Merge branch '32918-enable-ee-trigger' into 'master'Marin Jankovski2017-05-291-1/+2
|\ | | | | | | | | | | | | Pass EE variable to trigger if defined Closes #32918 See merge request !11710
| * Pass EE variable if needed32918-enable-ee-triggerBalasankar C2017-05-251-1/+2
| |
* | Merge branch 'fix_duplicated_assignees_on_milestone_page' into 'master'Sean McGivern2017-05-292-1/+14
|\ \ | | | | | | | | | | | | | | | | | | Fix: Milestone - Participants list is showing duplicate assignees Closes #32690 See merge request !11758
| * | Fix: Milestone - Participants list is showing duplicate assigneesfix_duplicated_assignees_on_milestone_pageValery Sizov2017-05-292-1/+14
| | |
* | | Merge branch 'sh-fix-issue-33011' into 'master'Grzegorz Bizon2017-05-291-10/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix failing spec in spec/requests/api/pipelines_spec.rb Closes #33001 See merge request !11756
| * | | Improve pipelines API specs related to special parametersGrzegorz Bizon2017-05-291-9/+15
| | | |
| * | | Simplify pipeline spec by using order instead of sort_bysh-fix-issue-33011Stan Hu2017-05-281-1/+1
| | | |
| * | | Fix failing spec in spec/requests/api/pipelines_spec.rbStan Hu2017-05-281-5/+5
| |/ / | | | | | | | | | | | | | | | | | | The spec was trying to sort pipelines by user ID, but the same user ID was being used for each pipeline in the spec. Closes #33001
* | | Merge branch 'gitaly-init-default' into 'master'Douwe Maan2017-05-291-0/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Duplicate gitaly init variables in 'default' file Closes #31858 See merge request !11738
| * | Duplicate gitaly init variables in 'default' fileJacob Vosmaer2017-05-261-0/+2
| | | | | | | | | | | | | | | | | | | | | This is needed because these variables depend (directly or indirectly) on the 'app_root' variable which can be changed in the default file. If app_root has a non-standard value, the value of e.g. gitaly_dir generated in the init script becomes invalid.
* | | Merge branch 'patch-23' into 'master'Kamil Trzciński2017-05-271-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Replace "build" with "job" Closes #32994 See merge request !11746
| * | | Replace "build" with "job"Fabio Busatto2017-05-261-3/+3
| | | | | | | | | | | | Close #32994
* | | | Merge branch 'add-relevant-ee-spec' into 'master'Stan Hu2017-05-271-0/+25
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Add missing project import job example from gitlab-ee See merge request !7106
| * | | Update spec to match latest EE changesStan Hu2017-05-261-2/+7
| | | |
| * | | Add missing project import job example from gitlab-eeAlejandro Rodríguez2017-05-261-0/+20
| | | |
* | | | Merge branch 'apply-same-responsive-notes-to-parallel-diff' into 'master'Annabel Dunstone Gray2017-05-264-33/+42
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Apply responsive note styles to parallel diffs See merge request !11701
| * | | | Apply responsive note styles to parallel diffsapply-same-responsive-notes-to-parallel-diffEric Eastwood2017-05-264-33/+42
| | | | | | | | | | | | | | | | | | | | | | | | | Fix inspired while working on https://gitlab.com/gitlab-org/gitlab-ce/issues/32801
* | | | | Merge branch 'enable-duplicate-property-scss-lint' into 'master'Clement Ho2017-05-2610-9/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable DuplicateProperty scss-lint See merge request !11722
| * | | | | Enable DuplicateProperty scss-lintAnnabel Dunstone Gray2017-05-2610-9/+3
|/ / / / /
* | | | | Merge branch ↵Fatih Acet2017-05-2611-12/+102
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project' into 'master' Disable "Remove source branch" in MR Widget for users who can't remove, and re-add checkbox to MR form Closes #32447 and #32907 See merge request !11558
| * | | | Update MWPS feature spec per change to remove source branch default.32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-projectBryce Johnson2017-05-251-2/+2
| | | | |
| * | | | Fallback to false when remove_source_branch is null.Bryce Johnson2017-05-251-1/+1
| | | | |
| * | | | Merge branch ↵Bryce Johnson2017-05-252-1/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project' of gitlab.com:gitlab-org/gitlab-ce into 32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project
| | * | | | Expose remove_source_branch boolean/nullOswaldo Ferreira2017-05-242-1/+3
| | | | | |
| * | | | | Update shouldRemoveSourceBranch against API entity changes.Bryce Johnson2017-05-251-3/+1
| |/ / / /
| * | | | Set up merge request from fork more simply.Bryce Johnson2017-05-241-10/+2
| | | | |
| * | | | Remove spec from created_from_fork_spec.Bryce Johnson2017-05-241-15/+0
| | | | |
| * | | | Move spec and add one for merge button not disabled.Bryce Johnson2017-05-241-0/+29
| | | | |
| * | | | Add spec for disabled Remove source branch checkbox.Bryce Johnson2017-05-231-0/+15
| | | | |
| * | | | Set merge params to force_remove_source_branch by default.Bryce Johnson2017-05-231-2/+4
| | | | |
| * | | | Update spinach specs to explicitly check Remove Source Branch.Bryce Johnson2017-05-232-2/+7
| | | | |
| * | | | Shush rubocop.Bryce Johnson2017-05-221-1/+0
| | | | |
| * | | | Don't use getElementById in specs.Bryce Johnson2017-05-221-2/+2
| | | | |
| * | | | Shush eslint.Bryce Johnson2017-05-221-1/+1
| | | | |
| * | | | Upgrade Remove Source Branch checkbox UX.Bryce Johnson2017-05-225-5/+68
| | | | |
* | | | | Merge branch 'dm-consistent-note-paddings' into 'master'Annabel Dunstone Gray2017-05-268-54/+75
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | More consistent padding of notes, system notes, and note form See merge request !11720
| * | | | | More consistent padding of notes, system notes, and note formDouwe Maan2017-05-268-54/+75
|/ / / / /
* | | | | Merge branch 'dm-dependency-value-regex' into 'master'Grzegorz Bizon2017-05-263-6/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Don't allow spaces in dependency linker value regex See merge request !11721
| * | | | | Add specdm-dependency-value-regexDouwe Maan2017-05-261-1/+10
| | | | | |
| * | | | | Don't allow spaces in dependency linker value regexDouwe Maan2017-05-252-5/+5
| | | | | |
* | | | | | Merge branch ↵Grzegorz Bizon2017-05-262-22/+78
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '31459-fix-transient-error-caused-by-small-timeout-also-adapt-tests-to-work-locally-correctly' into 'master' Fix transient CI errors by increasing command execution timeouts from 1s to 30s Closes #31459 See merge request !11420
| * | | | | | Move helpers to spec file, use const's instead of helper methodsPawel Chojnacki2017-05-253-35/+26
| | | | | | |
| * | | | | | Make the test cases more readable and fix to_s coercion problemPawel Chojnacki2017-05-231-19/+26
| | | | | | |
| * | | | | | Stop skipping tests if local dependencies are not foundPawel Chojnacki2017-05-222-9/+1
| | | | | | |
| * | | | | | Fix transient CI errors by increasing command execution timeouts from 1s to 30sPawel Chojnacki2017-05-173-7/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | + actually make local tests correctly detect wether 'timeout' or 'gtimeout' is available
* | | | | | | Merge branch 'ci-build-pipeline-header-vue' into 'master'Phil Hughes2017-05-266-0/+352
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates CI Header component to use in pipelines and job details pages See merge request !11726
| * | | | | | | Creates CI Header component to use in pipelines and job details pagesFilipa Lacerda2017-05-266-0/+352
|/ / / / / / /
* | | | | | | Merge branch 'enable-final-newline' into 'master'Clement Ho2017-05-262-34/+34
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable final newline See merge request !11723
| * | | | | | | Enable final newline ruleenable-final-newlineAnnabel Dunstone Gray2017-05-262-34/+34
| | | | | | | |
View Lorry Controller Status