summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | Merge branch 'transaction-metrics' into 'master'Lin Jen-Shin2019-06-281-0/+3
| |\ \ \
| | * | | Adds metrics to measure database transactionstransaction-metricsAndrew Newdigate2019-06-281-0/+3
| | | |/ | | |/|
| * | | Replace 'JIRA' with 'Jira'Takuya Noguchi2019-06-282-2/+2
| * | | Get memory data after booting app in production62722-boot-app-in-ci-and-check-memoryAleksei Lipniagov2019-06-281-1/+1
| * | | Merge branch 'id-extract-widget-into-different-request' into 'master'Ash McKenzie2019-06-281-0/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Extract MR's widget into a separate endpointid-extract-widget-into-different-requestIgor Drozdov2019-06-281-0/+1
| | |/
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2019-07-032-3/+6
|\ \ \ | |/ / |/| |
| * | Merge branch 'osw-persist-tmp-snippet-uploads' into 'master'Marin Jankovski2019-07-021-2/+2
| |\ \
| | * | Persist tmp snippet uploadsOswaldo Ferreira2019-06-171-2/+2
| * | | Merge branch 'security-prevent-detection-of-merge-request-template-name' into...Marin Jankovski2019-07-021-1/+4
| |\ \ \
| | * | | Authorize access before serving project templateLuke Duncalfe2019-06-111-1/+4
* | | | | Merge branch 'rs-ee-only-routes-2' into 'master'Lin Jen-Shin2019-06-276-7/+167
|\ \ \ \ \
| * | | | | Delineate additional EE-only routesrs-ee-only-routes-2Robert Speicher2019-06-262-16/+29
| * | | | | Copy routes from EERobert Speicher2019-06-266-7/+154
* | | | | | Merge branch '53811-issue-boards-to-core-projects-backend-ce' into 'master'Stan Hu2019-06-271-1/+5
|\ \ \ \ \ \
| * | | | | | Move Multiple Issue Boards for Projects to Core53811-issue-boards-to-core-projects-backend-ceAlexandru Croitor2019-06-261-1/+5
* | | | | | | Merge branch 'dz-remove-deprecated-user-routes' into 'master'Mike Greiling2019-06-272-10/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Remove deprecated /u/:username routesdz-remove-deprecated-user-routesDmitriy Zaporozhets2019-06-262-10/+1
* | | | | | | Merge branch 'refactor/remove-sentry-from-app-settings' into 'master'Stan Hu2019-06-261-10/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | refactor: remove Sentry from application settingsRoger Meier2019-06-251-10/+3
| | |/ / / / | |/| | | |
* | | | | | Speed up obtaining Let's Encrypt certificatesVladimir Shushlin2019-06-261-1/+1
|/ / / / /
* | | | | Copy inflections from EErs-ee-inflectionsRobert Speicher2019-06-251-0/+8
| |_|_|/ |/| | |
* | | | Refactor inside_transaction? to Gitlab::DatabaseAndrew Newdigate2019-06-251-1/+1
|/ / /
* | | Renew Let's Encrypt certificatesVladimir Shushlin2019-06-242-0/+5