summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | port the object storage to CEMicaël Bergeron2018-03-012-0/+7
| | * | | | | Merge remote-tracking branch 'origin/master' into object-storage-ee-to-ce-bac...object-storage-ee-to-ce-backportKamil Trzciński2018-02-2814-68/+115
| | |\ \ \ \ \
| | * | | | | | Merge branch '4915-background-upload-option-is-not-effective' into 'master'Kamil Trzciński2018-02-281-9/+9
| | * | | | | | Merge branch '4879-support-private-https-urls-for-object-storage' into 'master'Sean McGivern2018-02-281-0/+20
| | * | | | | | Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into object-storage-e...Kamil Trzciński2018-02-2810-3/+133
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge commit '8af23def1d6' into object-storage-ee-to-ce-backportKamil Trzciński2018-02-2822-74/+223
| | |\ \ \ \ \ \ \
| | | * | | | | | | Revert "Merge branch '3867-port-to-ce' into 'master'"Kamil Trzciński2018-02-282-19/+2
| | * | | | | | | | Merge branch '4163-move-uploads-to-object-storage' into 'master'Sean McGivern2018-02-282-9/+52
| | * | | | | | | | Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into object-storage-e...Kamil Trzciński2018-02-2817-45/+110
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Merge branch 'zj-auto-upload-job-artifacts' into 'master'Kamil Trzciński2018-02-281-0/+1
| | * | | | | | | | | Merge branch 'zj-multiple-artifacts-ee' into 'master'Grzegorz Bizon2018-02-281-0/+1
| | * | | | | | | | | Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into object-storage-e...Kamil Trzciński2018-02-2827-63/+201
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into object-storage-e...Kamil Trzciński2018-02-2823-129/+171
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into object-storage-e...Kamil Trzciński2018-02-2823-54/+233
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Merge branch 'jej/lfs-object-storage' into 'master'Douwe Maan2018-02-283-3/+48
| | * | | | | | | | | | | | Merge commit 'b39d0c318921bae2e3a11df9ee6828291dad9864' into object-storage-e...Kamil Trzciński2018-02-2828-97/+224
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '5b08d59f07fc53c1e34819fac20352119d5343e6' into object-storage-e...Kamil Trzciński2018-02-2838-106/+662
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Merge branch 'zj-object-store-artifacts' into 'master'Grzegorz Bizon2018-02-282-0/+14
| * | | | | | | | | | | | | | | Merge branch 'blackst0ne-rails5-update-files-by-rails-app-update' into 'master'43098-controller-projects-issuescontroller-show-executes-more-than-100-sql-queriesRobert Speicher2018-03-237-6/+74
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | [Rails5] Update files by `rails app:update`blackst0ne-rails5-update-files-by-rails-app-updateblackst0ne2018-03-227-6/+74
| * | | | | | | | | | | | | | | | Merge branch '44589-problem-with-prettier-setting-trailingcomma-all' into 'ma...Filipa Lacerda2018-03-232-48/+55
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | prettify all node scriptsMike Greiling2018-03-232-48/+55
| * | | | | | | | | | | | | | | | | Merge branch 'pages_force_https' into 'master'Nick Thomas2018-03-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Add HTTPS-only pagesRob Watson2018-03-221-1/+1
| * | | | | | | | | | | | | | | | | Merge branch 'mark-legacy-git-access' into 'master'Sean McGivern2018-03-232-10/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Route path lookups through legacy_disk_pathmark-legacy-git-accessJacob Vosmaer2018-03-212-10/+5
| * | | | | | | | | | | | | | | | | | Merge branch 'prettier-ignore' into 'master'Mike Greiling2018-03-221-73/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Added prettierignore fileprettier-ignorePhil Hughes2018-03-211-73/+51
| * | | | | | | | | | | | | | | | | | | Merge branch 'move-concatenate-module-plugin' into 'master'Jacob Schatz2018-03-221-3/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | enable scope hoisting only in produciton (it interferes with HMR)Mike Greiling2018-03-221-3/+1
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Force Rails to not complain about reloadingLin Jen-Shin2018-03-221-1/+1
| |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Merge branch 'jej/omniauth-initializer-refactor' into 'master'Douwe Maan2018-03-221-45/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | OmniauthInitializer created to improve devise.rbJames Edwards-Jones2018-03-201-45/+1
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'blackst0ne-rails5-update-ar5-batching-initializer' into 'master'Robert Speicher2018-03-211-37/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | [Rails5] Update ar5_batching initializerblackst0ne-rails5-update-ar5-batching-initializerblackst0ne2018-03-211-37/+35
| | | |_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'blackst0ne-rails5-update-ar5-pg-10-support-initializer' into 'm...Robert Speicher2018-03-211-3/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | [Rails5] Update ar5_pg_10_support initializerblackst0ne-rails5-update-ar5-pg-10-support-initializerblackst0ne2018-03-211-3/+2
| | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge branch 'make-ide-ce' into 'master'Tim Zallmann2018-03-212-50/+76
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Move IDE to CEPhil Hughes2018-03-202-50/+76
| | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Strip any query string parameters from Location headers from logrageStan Hu2018-03-201-0/+18
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge branch 'ajax-requests-in-performance-bar' into 'master'Robert Speicher2018-03-191-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Show Ajax requests in performance barSean McGivern2018-03-191-1/+1
| * | | | | | | | | | | | | | | | Merge branch 'blackst0ne-rails5-update-active-record-locking-initializer' int...Robert Speicher2018-03-191-52/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | [Rails5] Update active_record_locking initializerblackst0ne-rails5-update-active-record-locking-initializerblackst0ne2018-03-181-52/+56
| | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Address review comments.Andreas Brandl2018-03-161-1/+1
| * | | | | | | | | | | | | | | Add bigserial as a native database type for MySQL adapterDouglas Barbosa Alexandre2018-03-161-0/+11
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Revert "Merge branch 'sh-filter-secret-variables' into 'master'"Stan Hu2018-03-131-2/+0
| * | | | | | | | | | | | | | Make Gitaly more prominent in the performance barSean McGivern2018-03-131-2/+2
| * | | | | | | | | | | | | | Resolve "Projects::MergeRequestsController#show is slow (implement skeleton l...Simon Knox2018-03-131-1/+1
| * | | | | | | | | | | | | | Merge branch 'allow-ee-in-backtraces' into 'master'Robert Speicher2018-03-121-7/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |