summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | add changelog entryLuke Bennett2018-07-271-0/+6
| | | | |
| * | | | Add instance_statistics_visibility_private application setting and top nav iconLuke Bennett2018-07-276-2/+35
| | | | |
| * | | | Create instance_statistics namespace and move convdev index and cohorts to itLuke Bennett2018-07-2721-19/+79
| | | | |
* | | | | Merge branch 'andr3-remove-mr-regressions-fixes-from-master' into 'master'Filipa Lacerda2018-08-0136-786/+242
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove fixes for MR refactor regressions from master See merge request gitlab-org/gitlab-ce!20920
| * | | | | Revert "Merge branch '_acet-fix-outdated-discussions' into 'master'"André Luís2018-08-0114-141/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 740ae2d194f3833e224c326cc909d833c5807484, reversing changes made to 1ba47de5fef7a86a453e97a574741d3dba85c521.
| * | | | | Revert "Merge branch '_acet-fix-expanding-context-lines' into 'master'"André Luís2018-08-013-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6c6988cb5ef8bb749da058b5fe1bf0e188e8062f, reversing changes made to 0d488c7b8a7ab462b78daa20e0f12fe73ebb8a6d.
| * | | | | Revert "Merge branch '_acet-fix-mr-autosave' into 'master'"André Luís2018-08-019-101/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5ba542b1094bd8fd95d48d2ac834fd8605cf8fee, reversing changes made to 32c831ea2b8425c71c790b67fb8f2170f3d9955a.
| * | | | | Revert "Merge branch '48817-fix-mr-changes-discussion-navigation' into 'master'"André Luís2018-08-0110-407/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ced005f330419ec81657e852c5cb9124fdb29fbb, reversing changes made to 9b01b293ce5ddbaeedaf014cdc804af2c5e86416.
| * | | | | Revert "Merge branch 'tz-mr-refactor-memory-reduction' into 'master'"André Luís2018-08-0110-144/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2411ecb5762f8e04a6c6f61cc50ed25f29f55be3, reversing changes made to 58a0df7e68e46902e453a0252e6753517d9cf665.
| * | | | | Revert "Merge branch 'tz-mr-refactor-mem-posting' into 'master'"André Luís2018-08-013-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9c121352aa59098be357d82538a4878540a676c9, reversing changes made to c1b335e0122052ff51e9c55f150f13e841737797.
* | | | | | Merge branch 'timeouted' into 'master'Grzegorz Bizon2018-08-012-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | correct error message on helm tiller installation timeout See merge request gitlab-org/gitlab-ce!20683
| * | | | | | corrected test for new errortimeoutedDiana Stanley2018-07-181-1/+1
| | | | | | |
| * | | | | | correct error messageDiana Stanley2018-07-171-1/+1
| | | | | | |
* | | | | | | Merge branch 'runner-features' into 'master'Grzegorz Bizon2018-08-0111-41/+249
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `runner_unsupported` CI failure See merge request gitlab-org/gitlab-ce!20664
| * | | | | | | Fix spec failuresKamil Trzciński2018-08-011-2/+2
| | | | | | | |
| * | | | | | | Improve error messageKamil Trzciński2018-08-011-1/+1
| | | | | | | |
| * | | | | | | Add changelogKamil Trzciński2018-08-011-0/+5
| | | | | | | |
| * | | | | | | Add specs for unsupported runnerKamil Trzciński2018-08-014-2/+107
| | | | | | | |
| * | | | | | | Fix spec failuresKamil Trzciński2018-08-012-11/+12
| | | | | | | |
| * | | | | | | More clever way for testing runner featuresKamil Trzciński2018-08-011-8/+14
| | | | | | | |
| * | | | | | | If reports are used, require runner to expose `upload_multiple_artifacts` ↵Kamil Trzciński2018-08-011-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature
| * | | | | | | Improve Ci::Status::Build specsKamil Trzciński2018-08-012-8/+39
| | | | | | | |
| * | | | | | | Improve CommitStatusPresenterKamil Trzciński2018-08-012-7/+34
| | | | | | | |
| * | | | | | | Fix current spec failuresKamil Trzciński2018-08-013-16/+12
| | | | | | | |
| * | | | | | | Fix spec failuresKamil Trzciński2018-08-013-4/+4
| | | | | | | |
| * | | | | | | Add `runner_unsupported` CI failureKamil Trzciński2018-08-017-18/+49
| | | | | | | |
* | | | | | | | Merge branch 'docs-jivl-bump-update-guides-ce' into 'master'James Lopez2018-08-011-0/+378
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create update guide from 11.1 to 11.2 See merge request gitlab-org/gitlab-ce!20945
| * | | | | | | | Create update guide from 11.1 to 11.2Jose Vargas2018-07-311-0/+378
| | | | | | | | |
* | | | | | | | | Merge branch 'docs-jivl-update-from-source-document' into 'master'James Lopez2018-08-011-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update installation docs branches for source installations See merge request gitlab-org/gitlab-ce!20944
| * | | | | | | | | update 11-2-stable branches for source installationsJose Vargas2018-07-311-3/+3
| |/ / / / / / / /
* | | | | | | | | Merge branch 'fix-multiple-scopes' into 'master'Grzegorz Bizon2018-08-015-39/+155
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support multiple scopes when authing container registry scopes Closes #48968 See merge request gitlab-org/gitlab-ce!20617
| * | | | | | | | | Support multiple scopes when using authing container registry scopesKamil Trzciński2018-08-015-39/+155
| | | | | | | | | |
* | | | | | | | | | Merge branch 'user-argument-2/upstream' into 'master'Nick Thomas2018-08-017-24/+280
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for ssh certificates (internal API) Closes #34572 See merge request gitlab-org/gitlab-ce!19911
| * | | | | | | | | | Add support for SSH certificate authenticationÆvar Arnfjörð Bjarmason2018-08-017-24/+280
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Why and how to enable this is covered in the docs being changed here. This requires gitlab-org/gitlab-shell@2e8b670 ("Add support for SSH certificate authentication", 2018-06-14) which has been merged in and tagged as 8.0.0, so GITLAB_SHELL_VERSION needs to be bumped. Merging this closes gitlab-org/gitlab-ce#34572 see gitlab-org/gitlab-shell!207 for the gitlab-shell MR. Implementation notes: - The APIs being changed here are all internal, and their sole consumer is gitlab-shell. - Most of the changed code is a MR to gitlab-shell, see the gitlab-org/gitlab-shell!207 MR. That change covers why only some of the internal methods get a new "username" parameter, and why some others only get a "user_id".
* | | | | | | | | | | Merge branch 'patch-11' into 'master'Rémy Coutable2018-08-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update test-and-deploy-python-application-to-heroku.md See merge request gitlab-org/gitlab-ce!20921
| * | | | | | | | | | | Update test-and-deploy-python-application-to-heroku.mdPeter Sowah2018-07-311-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rails5-fix-flaky-spec-user-uses-shortcuts' into 'master'Rémy Coutable2018-08-012-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails5: fix flaky spec See merge request gitlab-org/gitlab-ce!20953
| * | | | | | | | | | | Rails5: fix flaky specJasper Maes2018-08-012-0/+7
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '1756-set-iid-via-api' into 'master'Sean McGivern2018-08-018-8/+169
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Allow issue's Internal ID (`iid`) to be set when creating via the API" Closes #1756 See merge request gitlab-org/gitlab-ce!20626
| * | | | | | | | | | | Resolve "Allow issue's Internal ID (`iid`) to be set when creating via the API"Jamie Schembri2018-08-018-8/+169
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'follow-up-20723' into 'master'Sean McGivern2018-08-013-10/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a few disrepencies between CE and EE in the lines ordering See merge request gitlab-org/gitlab-ce!20937
| * | | | | | | | | | | Fix a few disrepencies between CE and EE in the lines orderingRémy Coutable2018-08-013-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | Merge branch 'jprovazn-resource-events' into 'master'Sean McGivern2018-08-0112-1/+251
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resource event model Closes #47993 See merge request gitlab-org/gitlab-ce!20606
| * | | | | | | | | | | | Resource event modelJan Provaznik2018-08-0112-1/+251
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'fj-6860-instance-level-project-templates' into 'master'Sean McGivern2018-08-0110-93/+177
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE Port]: Implement instance level project templates See merge request gitlab-org/gitlab-ce!20761
| * | | | | | | | | | | | Changed docFrancisco Javier López2018-07-311-4/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixed extensionFrancisco Javier López2018-07-301-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixed typoFrancisco Javier López2018-07-301-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Changed docsFrancisco Javier López2018-07-302-10/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Updated docFrancisco Javier López2018-07-301-1/+4
| | | | | | | | | | | | |