summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* MR Diffs Refactor Part 04: Minor refactor on old code._mr-refactor-part-4Fatih Acet2018-03-196-10/+20
* Merge branch 'le-issue-boards-height-calculation' into 'master'Phil Hughes2018-03-194-61/+80
|\
| * Make issue boards height calculation clearer and remove magic numbersLukas Eipert2018-03-194-61/+80
|/
* Merge branch 'tc-package-qa-rename-docs' into 'master'Grzegorz Bizon2018-03-193-3/+3
|\
| * Rename `package-qa` in docsToon Claes2018-03-193-3/+3
|/
* Merge branch 'update-gitlab-ci-yml-services-docs' into 'master'Achilleas Pipinellis2018-03-192-1/+67
|\
| * Copyedit CI services docsAchilleas Pipinellis2018-03-191-56/+33
| * Add CHANGELOG entryupdate-gitlab-ci-yml-services-docsTomasz Maczukin2018-03-141-0/+5
| * Update CI services documnetationTomasz Maczukin2018-03-141-0/+84
* | Merge branch 'update-kubeclient' into 'master'Grzegorz Bizon2018-03-1912-22/+23
|\ \
| * \ Merge branch 'master' into 'update-kubeclient'Grzegorz Bizon2018-03-17233-3409/+5755
| |\ \
| * | | Replace KubeException with Kubeclient::HttpError (kubeclient 3.0)Pirate Praveen2018-03-1510-10/+10
| * | | Update kubeclient 2.2.0 -> 3.0Pirate Praveen2018-03-142-12/+12
* | | | Merge branch 'refactor/move-mr-widget-unresolved-discussions-vue-component' i...Mike Greiling2018-03-195-32/+43
|\ \ \ \
| * | | | Move UnresolvedDiscussions vue componentGeorge Tsiolis2018-03-085-32/+43
* | | | | Merge branch 'fix/sm/clarify-ambiguous-with_artifacts-implication' into 'master'Kamil Trzciński2018-03-186-7/+55
|\ \ \ \ \
| * | | | | Fix specfix/sm/clarify-ambiguous-with_artifacts-implicationShinya Maeda2018-03-161-1/+1
| * | | | | Use with_artifacts_archive name. Add specShinya Maeda2018-03-154-6/+42
| * | | | | Fix corrupted testShinya Maeda2018-03-151-1/+1
| * | | | | Add feartue spec. Fix failed testShinya Maeda2018-03-152-1/+13
| * | | | | Add rubocop:disable GitlabSecurity/PublicSendShinya Maeda2018-03-151-1/+1
| * | | | | Clarify ambiguous with_artifacts implicationShinya Maeda2018-03-153-6/+6
* | | | | | Merge branch 'fix-dropzone-project-show' into 'master'Jacob Schatz2018-03-183-4/+44
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix dropzone project showClement Ho2018-03-183-4/+44
|/ / / / /
* | | | | Merge branch 'sh-fix-module-reloading' into 'master'Robert Speicher2018-03-161-1/+1
|\ \ \ \ \
| * | | | | Fix "A copy of Gitlab::Metrics::Methods" have been removed errorStan Hu2018-03-161-1/+1
* | | | | | Merge branch 'acet-notes-prettified' into 'master'Mike Greiling2018-03-1626-1792/+2149
|\ \ \ \ \ \
| * | | | | | Prettify notes.Fatih Acet2018-03-1626-1792/+2149
* | | | | | | Merge branch 'profile-notifications-dropdown-fix' into 'master'Filipa Lacerda2018-03-162-1/+8
|\ \ \ \ \ \ \
| * | | | | | | Fixed profile notifications not being editableprofile-notifications-dropdown-fixPhil Hughes2018-03-162-1/+8
* | | | | | | | Merge branch '39521-fix-merge-request-discussion-timestamp-overflow' into 'ma...Fatih Acet2018-03-161-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix discussion timestamp overflow in merge request parallel view39521-fix-merge-request-discussion-timestamp-overflowdtang2018-03-061-1/+1
* | | | | | | | Merge branch 'sh-optimize-admin-projects-page' into 'master'Robert Speicher2018-03-162-2/+6
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Fix timeouts loading /admin/projects pagesh-optimize-admin-projects-pageStan Hu2018-03-152-2/+6
* | | | | | | | Merge branch 'toon-master-patch-57286' into 'master'Marin Jankovski2018-03-161-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Rename manual job to `package-and-qa`Toon Claes2018-03-161-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'opnshift-docs-patch' into 'master'Marcia Ramos2018-03-161-1/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | OpenShift install docs: Recommend "add-scc-to-user" over "edit scc"Joe Mullally2018-03-161-1/+10
* | | | | | | | | Merge branch 'jramsay-43804-jupyter-docs' into 'master'Marcia Ramos2018-03-162-0/+18
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Add Jupyter Notebook docsJames Ramsay2018-03-162-0/+18
|/ / / / / / / /
* | | | | | | | Merge branch 'gitaly-0.91.0' into 'master'Robert Speicher2018-03-161-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Use Gitaly 0.91.0Jacob Vosmaer2018-03-161-1/+1
* | | | | | | | | Merge branch 'update_vendored_gitlab_ci_yml' into 'master'Robert Speicher2018-03-161-6/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update vendored gitlab-ci.yml template for auto-devopsOlivier Gonzalez2018-03-161-6/+5
* | | | | | | | | | Merge branch '41902-add-api-option-to-overwrite-project-description-on-projec...Grzegorz Bizon2018-03-1613-11/+60
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Adds the option to override project description on export via APITiago Botelho2018-03-1613-11/+60
* | | | | | | | | | | Merge branch '44126-setup-middleware-before-adapter' into 'master'Kamil Trzciński2018-03-161-2/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Setup Faraday middleware before adapterLin Jen-Shin2018-03-161-2/+3
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jej/commit-api-tracks-lfs' into 'master'Dmitriy Zaporozhets2018-03-1610-64/+270
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Extract constant for LfsPointerFile::VERSION_LINEJames Edwards-Jones2018-03-164-7/+10