summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Reapply "Merge branch 'tz-mr-refactor-mem-posting' into 'master'"andr3-reapply-mr-regression-fixes-safeAndré Luís2018-08-012-21/+7
* Reapply "Merge branch '48817-fix-mr-changes-discussion-navigation' into 'mast...André Luís2018-08-0110-68/+407
* Reapply "Merge branch '_acet-fix-mr-autosave' into 'master'"André Luís2018-08-019-50/+101
* Reapply "Merge branch '_acet-fix-expanding-context-lines' into 'master'"André Luís2018-08-013-4/+0
* Merge branch 'andr3-remove-mr-regressions-fixes-from-master' into 'master'Filipa Lacerda2018-08-0136-786/+242
|\
| * Revert "Merge branch '_acet-fix-outdated-discussions' into 'master'"André Luís2018-08-0114-141/+20
| * Revert "Merge branch '_acet-fix-expanding-context-lines' into 'master'"André Luís2018-08-013-0/+4
| * Revert "Merge branch '_acet-fix-mr-autosave' into 'master'"André Luís2018-08-019-101/+50
| * Revert "Merge branch '48817-fix-mr-changes-discussion-navigation' into 'master'"André Luís2018-08-0110-407/+68
| * Revert "Merge branch 'tz-mr-refactor-memory-reduction' into 'master'"André Luís2018-08-0110-144/+94
| * Revert "Merge branch 'tz-mr-refactor-mem-posting' into 'master'"André Luís2018-08-013-8/+21
* | Merge branch 'timeouted' into 'master'Grzegorz Bizon2018-08-012-2/+2
|\ \
| * | 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
|\ \ \
| * | | 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` fea...Kamil Trzciński2018-08-011-1/+7
| * | | 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.2Jose Vargas2018-07-311-0/+378
* | | | | Merge branch 'docs-jivl-update-from-source-document' into 'master'James Lopez2018-08-011-3/+3
|\ \ \ \ \
| * | | | | 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 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 certificate authenticationÆvar Arnfjörð Bjarmason2018-08-017-24/+280
* | | | | | | Merge branch 'patch-11' into 'master'Rémy Coutable2018-08-011-1/+1
|\ \ \ \ \ \ \
| * | | | | | | 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 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"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 orderingRémy Coutable2018-08-013-10/+10
* | | | | | | | | Merge branch 'jprovazn-resource-events' into 'master'Sean McGivern2018-08-0112-1/+251
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Resource event modelJan Provaznik2018-08-0112-1/+251
|/ / / / / / / / /
* | | | | | | | | Merge branch 'fj-6860-instance-level-project-templates' into 'master'Sean McGivern2018-08-0110-93/+177
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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