summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Remove obsolete chaos routesremove-obsolete-chaos-routesLuke Bennett2019-07-131-7/+0
* Merge branch 'js-specs-transactions' into 'master'Andreas Brandl2019-07-122-1/+4
|\
| * Use transactions in JS feature specsjs-specs-transactionsHeinrich Lee Yu2019-07-122-1/+4
* | Merge branch 'upgrade-rails-5-2-ce' into 'master'Bob Van Landuyt2019-07-1211-94/+50
|\ \
| * | Upgrade to Rails 5.2upgrade-rails-5-2-ceHeinrich Lee Yu2019-07-1211-94/+50
| |/
* | Merge branch 'group-analytics-frame' into 'master'Lin Jen-Shin2019-07-121-0/+13
|\ \ | |/ |/|
| * Port EE analytics routegroup-analytics-frameLuke Bennett2019-07-111-0/+13
* | Merge branch '64403-remove-setimmediate-polyfill' into 'master'Clement Ho2019-07-111-2/+4
|\ \ | |/ |/|
| * Remove setImmediate polyfill from production assetsMike Greiling2019-07-101-2/+4
* | Merge branch 'improve-chaos-controller' into 'master'Stan Hu2019-07-111-5/+8
|\ \
| * | Add `db_spin` and refactor ChaosControllerimprove-chaos-controllerKamil Trzciński2019-07-111-5/+8
* | | Merge branch '35757-move-issues-in-boards-pderichs' into 'master'Jan Provaznik2019-07-111-1/+5
|\ \ \
| * | | Add endpoint to move multiple issues35757-move-issues-in-boards-pderichsPatrick Derichs2019-07-111-1/+5
| |/ /
* | | Merge branch '490-enable-puma-by-default-in-GDK' into 'master'Grzegorz Bizon2019-07-111-2/+2
|\ \ \ | |/ / |/| |
| * | Enable puma by default in GDK490-enable-puma-by-default-in-GDKQingyu Zhao2019-07-091-2/+2
* | | Add a rubocop for Rails.loggerMayra Cabrera2019-07-106-9/+9
| |/ |/|
* | Copy EE-only config files to CErs-config-parityRobert Speicher2019-07-094-0/+613
* | CE-EE parity for shared config filesRobert Speicher2019-07-093-1/+30
* | Merge branch 'rs-basic-config-files' into 'master'Lin Jen-Shin2019-07-0910-2/+163
|\ \
| * | Add frozen_string_literal to EE files now in CErs-basic-config-filesRobert Speicher2019-07-085-0/+10
| * | Move lib/gitlab dependency to applicationRobert Speicher2019-07-082-2/+1
| * | CE-EE parity for files in config/initializersRobert Speicher2019-07-084-2/+31
| * | Add EE-only initializersRobert Speicher2019-07-085-0/+123
| |/
* | Remove `:graphql` feature flagcharlie ablett2019-07-091-4/+2
* | Limit user information to RackAttack throttlesMayra Cabrera2019-07-091-1/+1
|/
* Replace runtime isEE check with compile time one60213-fix-is-ee-webpack-checksLukas Eipert2019-07-051-0/+3
* Merge branch 'fix-sidekiq-transaction-check-race' into 'master'Nick Thomas2019-07-041-6/+7
|\
| * Fix race in forbid_sidekiq_in_transactions.rbfix-sidekiq-transaction-check-raceKamil Trzciński2019-07-041-6/+7
* | Merge branch 'mj/config-readme-diff' into 'master'Achilleas Pipinellis2019-07-041-2/+1
|\ \
| * | Remove empty lines in config/README.mdmj/config-readme-diffMarin Jankovski2019-07-041-2/+1
| |/
* | Change 'Todo' to 'To Do'Christie Lenneville2019-07-041-4/+4
|/
* Only save Peek session in Redis when Peek is enabledRémy Coutable2019-07-031-0/+3
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2019-07-0314-47/+231
|\
| * Merge branch '63869-store-prometheus-metrics-in-separate-dirs-in-test-and-pro...Kamil Trzciński2019-07-021-4/+16
| |\
| | * Use separate Prometheus metrics dirs in dev/test63869-store-prometheus-metrics-in-separate-dirs-in-test-and-prodAleksei Lipniagov2019-07-021-4/+16
| * | Include user id and username in auth logMayra Cabrera2019-07-021-2/+12
| * | Start UnicornSampler in master processJan Provaznik2019-07-021-6/+4
| |/
| * Includes logic to persist namespace statisticsMayra Cabrera2019-07-022-0/+4
| * Add a memory cache local to the thread to reduce Redis loadStan Hu2019-07-011-0/+3
| * Run do_master_restart callback on server startJan Provaznik2019-07-013-8/+39
| * Merge branch '62722-boot-app-in-ci-and-check-memory-ce' into 'master'Kamil Trzciński2019-07-011-1/+1
| |\
| | * Get memory data after booting app in production62722-boot-app-in-ci-and-check-memory-ceAleksei Lipniagov2019-06-281-1/+1
| * | Merge branch 'zj-circuit-breaker-removal-part-deux' into 'master'Bob Van Landuyt2019-07-011-15/+6
| |\ \
| | * | Remove ignored circuit_breaker columnsZeger-Jan van de Weg2019-06-281-15/+6
| * | | Merge branch 'id-stale-branches' into 'master'Grzegorz Bizon2019-07-011-1/+4
| |\ \ \
| | * | | Add endpoint for fetching diverging commit countsid-stale-branchesIgor Drozdov2019-06-281-1/+4
| * | | | Merge branch 'rs-config-settings' into 'master'Lin Jen-Shin2019-06-291-8/+136
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Move mirror settings to their own EE blockrs-config-settingsRobert Speicher2019-06-281-3/+6
| | * | | Copy Settings initializer from EERobert Speicher2019-06-271-8/+133
| | | |/ | | |/|
| * | | Revert "Merge branch '62722-boot-app-in-ci-and-check-memory' into 'master'"Rémy Coutable2019-06-281-1/+1