summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update ProjectStatistics#build_artifacts_size synchronously without summing (...41059-calculate-artifact-size-more-efficientlyDylan Griffith2018-03-216-99/+105
* 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
| * | | | | | | Avoid printing data for LfsPointerFile#inspectjej/commit-api-tracks-lfsJames Edwards-Jones2018-03-151-0/+4
| * | | | | | | Use correct encoding with Lfs::FileTransfromerJames Edwards-Jones2018-03-154-19/+68
| * | | | | | | Lfs::FileTranformer caches .gitattributes parserJames Edwards-Jones2018-03-152-3/+8
| * | | | | | | Avoid failed integrity check by linking LfsObjectProjects soonerJames Edwards-Jones2018-03-154-67/+30
| * | | | | | | Multi-file upload and Commit API obey LFS filtersJames Edwards-Jones2018-03-156-11/+193
| * | | | | | | Rename Lfs::FileModificationHandler to Lfs::FileTransformerJames Edwards-Jones2018-03-152-2/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'docs-refactor-dev-guides' into 'master'44320-add-security-details-in-a-table-to-contributing-manualAchilleas Pipinellis2018-03-162-296/+316
|\ \ \ \ \ \ \
| * | | | | | | Docs: refactor doc general guidelines and style guidelinesMarcia Ramos2018-03-162-296/+316
|/ / / / / / /
* | | | | | | Merge branch 'docs-update_code_quality_example' into 'master'Achilleas Pipinellis2018-03-161-7/+15
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Update Code Quality example documentationdocs-update_code_quality_exampleOlivier Gonzalez2018-03-161-7/+15
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'docs-44273-fix-ce-install-link' into 'master'Achilleas Pipinellis2018-03-161-1/+1
|\ \ \ \ \ \
| * | | | | | Fix CE install link for downgrade docsMark Fletcher2018-03-141-1/+1
* | | | | | | Merge branch 'fix-check-task-docs' into 'master'Sean McGivern2018-03-161-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Add version available info to integrity check rake task docsBalasankar "Balu" C2018-03-161-3/+3
|/ / / / / / /