summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | 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 show Closes #44137 See merge request gitlab-org/gitlab-ce!17784
| * | | | | | | | | | | | | | | | | | 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 error Closes #44365 See merge request gitlab-org/gitlab-ce!17810
| * | | | | | | | | | | | | | | | | | Fix "A copy of Gitlab::Metrics::Methods" have been removed errorStan Hu2018-03-161-1/+1
| | |_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #44365
* | | | | | | | | | | | | | | | | | Merge branch 'acet-notes-prettified' into 'master'Mike Greiling2018-03-1626-1792/+2149
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prettify notes app See merge request gitlab-org/gitlab-ce!17812
| * | | | | | | | | | | | | | | | | | 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 editable Closes #44198 See merge request gitlab-org/gitlab-ce!17808
| * | | | | | | | | | | | | | | | | | Fixed profile notifications not being editableprofile-notifications-dropdown-fixPhil Hughes2018-03-162-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #44198
* | | | | | | | | | | | | | | | | | | Merge branch '39521-fix-merge-request-discussion-timestamp-overflow' into ↵Fatih Acet2018-03-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Right column of merge request discussion overflows" Closes #39521 See merge request gitlab-org/gitlab-ce!17550
| * | | | | | | | | | | | | | | | | | 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 page Closes #44338 See merge request gitlab-org/gitlab-ce!17785
| * | | | | | | | | | | | | | | | | | Fix timeouts loading /admin/projects pagesh-optimize-admin-projects-pageStan Hu2018-03-152-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These extra sort keys caused sequential scans on the namespaces and projects page. Removing them makes the page load on GitLab.com. Closes #44338
* | | | | | | | | | | | | | | | | | | Merge branch 'toon-master-patch-57286' into 'master'Marin Jankovski2018-03-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename manual job to `package-and-qa` See merge request gitlab-org/gitlab-ce!17807
| * | | | | | | | | | | | | | | | | | | Rename manual job to `package-and-qa`Toon Claes2018-03-161-1/+1
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make it more clear it's building the package **and** doing QA, rename the job.
* | | | | | | | | | | | | | | | | | | Merge branch 'opnshift-docs-patch' into 'master'Marcia Ramos2018-03-161-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenShift install docs: Recommend "add-scc-to-user" over "edit scc" See merge request gitlab-org/gitlab-ce!17787
| * | | | | | | | | | | | | | | | | | | 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 docs Closes #43804 See merge request gitlab-org/gitlab-ce!17495
| * | | | | | | | | | | | | | | | | | | 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.0 See merge request gitlab-org/gitlab-ce!17802
| * | | | | | | | | | | | | | | | | | | 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-devops See merge request gitlab-org/gitlab-ce!17804
| * | | | | | | | | | | | | | | | | | | Update vendored gitlab-ci.yml template for auto-devopsOlivier Gonzalez2018-03-161-6/+5
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch ↵Grzegorz Bizon2018-03-1613-11/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41902-add-api-option-to-overwrite-project-description-on-project-export' into 'master' Resolve "Extend API for exporting a project with option to overwrite project description" Closes #41902 and #34936 See merge request gitlab-org/gitlab-ce!17744
| * | | | | | | | | | | | | | | | | | | | Adds the option to override project description on export via APITiago Botelho2018-03-1613-11/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and fixes the project description not being imported
* | | | | | | | | | | | | | | | | | | | | Merge branch '44126-setup-middleware-before-adapter' into 'master'Kamil Trzciński2018-03-161-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eliminate Faraday warnings Closes #44126 See merge request gitlab-org/gitlab-ce!17795
| * | | | | | | | | | | | | | | | | | | | Setup Faraday middleware before adapterLin Jen-Shin2018-03-161-2/+3
| |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This eliminate the warnings: WARNING: Unexpected middleware set after the adapter. This won't be supported from Faraday 1.0.
* | | | | | | | | | | | | | | | | | | | Merge branch 'jej/commit-api-tracks-lfs' into 'master'Dmitriy Zaporozhets2018-03-1610-64/+270
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create commit API and Web IDE obey LFS filters Closes #42287 See merge request gitlab-org/gitlab-ce!16718
| * | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents `.gitattributes` blob lookup being repeated for every file checked at a given ref
| * | | | | | | | | | | | | | | | | | | Avoid failed integrity check by linking LfsObjectProjects soonerJames Edwards-Jones2018-03-154-67/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempted commits were failing due to the pre-recieve LfsIntegrity check. This is skipped during tests making this failure silent.
| * | | | | | | | | | | | | | | | | | | Multi-file upload and Commit API obey LFS filtersJames Edwards-Jones2018-03-156-11/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates Files::MultiService for the commits API which is in turn used by the multi-file upload web UI Ensures that files which should be in LFS are transformed into LFS pointers Uses Lfs::Transformer which then links LfsObjectProjects on success
| * | | | | | | | | | | | | | | | | | | 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 guidelines Closes #41281 See merge request gitlab-org/gitlab-ce!17378
| * | | | | | | | | | | | | | | | | | | 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 documentation See merge request gitlab-org/gitlab-ce!17788
| * | | | | | | | | | | | | | | | | | 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 docs Closes #44273 See merge request gitlab-org/gitlab-ce!17757
| * | | | | | | | | | | | | | | | | | 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 docs See merge request gitlab-org/gitlab-ce!17799
| * | | | | | | | | | | | | | | | | | | Add version available info to integrity check rake task docsBalasankar "Balu" C2018-03-161-3/+3
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'update-flipper' into 'master'Grzegorz Bizon2018-03-162-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update flipper 0.11.0 -> 0.13.0 See merge request gitlab-org/gitlab-ce!17722
| * | | | | | | | | | | | | | | | | | | Update flipper 0.11.0 -> 0.13.0Pirate Praveen2018-03-132-13/+13
| | |_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch '44235-update-knapsack-to-1.16.0' into 'master'Grzegorz Bizon2018-03-163-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update knapsack to 1.16.0 Closes #44235 See merge request gitlab-org/gitlab-ce!17735