summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Add the RedirectRoute#path index setup_postgresqlBob Van Landuyt2018-03-281-0/+2
* New migration helper for finding custom indexesBob Van Landuyt2018-03-281-4/+35
* Don't run ReworkRedirectRoutesIndexes during setupBob Van Landuyt2018-03-281-2/+0
* Remove permanent redirectsBob Van Landuyt2018-03-282-25/+5
* Revert "Merge branch 'workhorse-gitaly-mandatory' into 'master'"Sean McGivern2018-03-281-4/+4
* Remove some easy cases of 'path_to_repo' useJacob Vosmaer (GitLab)2018-03-282-3/+1
* Merge branch 'dm-refs-contains-sha-encoding' into 'master'Sean McGivern2018-03-281-1/+2
|\
| * Fix listing commit branch/tags that contain special charactersdm-refs-contains-sha-encodingDouwe Maan2018-03-271-1/+2
* | Merge branch '43603-ci-lint-support' into 'master'Kamil Trzciński2018-03-282-5/+6
|\ \
| * | Changes ci/lints controller to use authorize before actionMayra Cabrera2018-03-261-0/+1
| * | Make ci/lint page context aware:Mayra Cabrera2018-03-262-5/+5
* | | Merge branch 'ac/lfs-direct-upload-ee-to-ce' into 'master'Kamil Trzciński2018-03-281-8/+0
|\ \ \
| * | | Port LFS direct_upload from EEac/lfs-direct-upload-ee-to-ceAlessio Caiazza2018-03-271-8/+0
* | | | Merge branch 'jej/add-protected-branch-policy' into 'master'Nick Thomas2018-03-271-1/+4
|\ \ \ \
| * | | | API uses ProtectedBranchPolicy for destroy/createJames Edwards-Jones2018-03-261-1/+4
* | | | | Make all workhorse gitaly calls opt-outJacob Vosmaer (GitLab)2018-03-271-4/+4
| |/ / / |/| | |
* | | | Merge branch '40781-os-to-ce' into 'master'Sean McGivern2018-03-2713-17/+289
|\ \ \ \
| * | | | Backport EE changesMicaël Bergeron2018-03-221-0/+0
| * | | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-2256-161/+732
| |\ \ \ \
| * | | | | Fix http_io to make it return path is nilShinya Maeda2018-03-221-1/+1
| * | | | | Backport ee-40781-os-to-ceMicaël Bergeron2018-03-221-0/+4
| * | | | | Merge branch '40781-os-to-ce' of gitlab.com:gitlab-org/gitlab-ce into ce-4078...Micaël Bergeron2018-03-091-23/+0
| |\ \ \ \ \
| | * | | | | apply feedbackMicaël Bergeron2018-03-091-23/+0
| * | | | | | Add proxy_download to perform proxied sending of all filesMicaël Bergeron2018-03-096-16/+16
| |/ / / / /
| * | | | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-08171-2611/+4481
| |\ \ \ \ \
| * | | | | | [cherry-pick] '4862-verify-file-checksums'Sean McGivern2018-03-086-0/+179
| * | | | | | fix some broken specsMicaël Bergeron2018-03-061-1/+4
| * | | | | | removed EE specific code from the portMicaël Bergeron2018-03-011-0/+183
| * | | | | | another round of fixesMicaël Bergeron2018-03-013-0/+86
| * | | | | | Merge remote-tracking branch 'origin/master' into object-storage-ee-to-ce-bac...object-storage-ee-to-ce-backportKamil Trzciński2018-02-2890-446/+1256
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into object-storage-e...Kamil Trzciński2018-02-2894-428/+1340
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge commit '8af23def1d6' into object-storage-ee-to-ce-backportKamil Trzciński2018-02-28202-1078/+3016
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Revert "Merge branch '3867-port-to-ce' into 'master'"Kamil Trzciński2018-02-288-22/+18
| * | | | | | | | | Merge branch 'feature/sm/artifacts-trace-ee' into 'master'Kamil Trzciński2018-02-281-2/+10
| * | | | | | | | | Merge branch 'use-send-url-for-incompatible-runners' into 'master'Grzegorz Bizon2018-02-283-3/+20
| * | | | | | | | | Merge branch '4163-move-uploads-to-object-storage' into 'master'Sean McGivern2018-02-2810-20/+21
| * | | | | | | | | Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into object-storage-e...Kamil Trzciński2018-02-28139-1011/+2863
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Merge branch 'zj-multiple-artifacts-ee' into 'master'Grzegorz Bizon2018-02-281-2/+2
| * | | | | | | | | | Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into object-storage-e...Kamil Trzciński2018-02-28288-2151/+6093
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into object-storage-e...Kamil Trzciński2018-02-28176-1329/+3656
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into object-storage-e...Kamil Trzciński2018-02-28183-1767/+5243
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Merge branch 'zj-fix-resolver-issue' into 'master'Kamil Trzciński2018-02-281-0/+1
| * | | | | | | | | | | | | Merge branch 'zj-improve-object-store-rake-task' into 'master'Kamil Trzciński2018-02-281-3/+6
| * | | | | | | | | | | | | Merge branch 'jej/lfs-object-storage' into 'master'Douwe Maan2018-02-283-5/+29
| * | | | | | | | | | | | | Merge commit 'b39d0c318921bae2e3a11df9ee6828291dad9864' into object-storage-e...Kamil Trzciński2018-02-28255-1943/+4794
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '5b08d59f07fc53c1e34819fac20352119d5343e6' into object-storage-e...Kamil Trzciński2018-02-28218-2028/+4363
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Merge branch 'zj-object-store-artifacts' into 'master'Grzegorz Bizon2018-02-283-2/+21
* | | | | | | | | | | | | | | | Merge branch 'fix/ldap_wihtout_user' into 'master'Douwe Maan2018-03-274-18/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix LDAP login without user in DBHoratiu Eugen Vlad2018-03-274-18/+13
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'backstage/gb/populating-pipeline-refactoring' into 'master'Kamil Trzciński2018-03-268-93/+197
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \