summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/ |/|
| * Include the ee/ directory in backtracesallow-ee-in-backtracesSean McGivern2018-03-121-7/+2
* | Remove sync script for gitlab-svgs and reference the vendored library directlyMike Greiling2018-03-092-48/+6
|/
* Merge branch 'blackst0ne-add-rails5-method' into 'master'Dmitriy Zaporozhets2018-03-091-0/+6
|\
| * Add Gitlab.rails5? methodblackst0ne-add-rails5-methodblackst0ne2018-03-091-0/+6
* | [CE] Add Naming/FileName rule checking expected class/module per filenameGabriel Mazetto2018-03-084-10/+4
|/
* Service integration displays validation errors on test failJames Edwards-Jones2018-03-071-1/+1
* Merge branch 'replace_redcarpet_with_cmark' into 'master'Sean McGivern2018-03-071-0/+1
|\
| * Add CommonMark markdown enginereplace_redcarpet_with_cmarkblackst0ne2018-03-071-0/+1
* | Remove common_vue bundleMike Greiling2018-03-061-2/+0
* | Merge branch 'master' into 'issue_38337'Felipe Artur2018-03-067-15/+24
|\ \
| * \ Merge branch 'proper-fix-for-artifacts-service' into 'master'Grzegorz Bizon2018-03-061-0/+1
| |\ \
| | * | Integrate two workers into one ArchiveTraceWorker with pipeline_background qu...Shinya Maeda2018-03-061-1/+1
| | * | Add object_storage queue to sidekiq_queues.ym. and correct queue name in all_...Shinya Maeda2018-03-061-0/+1
| * | | Merge branch '40187-project-branch-dashboard-with-active-stale-branches' into...Rémy Coutable2018-03-061-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | Add overview of branches and a filter for active/stale branchesTakuya Noguchi2018-03-061-0/+1
| * | | Merge branch '43670-improve-gitlab-kubernetes-cpu-metrics' into 'master'Tim Zallmann2018-03-061-6/+6
| |\ \ \
| | * | | Final updates for metricsJoshua Lambert2018-02-281-3/+3
| | * | | Fix k8s metricsJoshua Lambert2018-02-271-5/+5