summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* 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
* Merge branch 'bw-issue-reorder' into 'master'Kamil Trzciński2019-06-211-0/+1
|\
| * Add reorder action to Project IssuesControllerbw-issue-reorderBrett Walker2019-06-211-0/+1
* | Merge branch 'config-yaml-differences' into 'master'Robert Speicher2019-06-207-3/+252
|\ \
| * | Backport gitlab.yml.example from EEconfig-yaml-differencesYorick Peterse2019-06-203-1/+217
| * | Backport Prometheus YAML config from EEYorick Peterse2019-06-201-2/+2
| * | Backport Sidekiq queue names from EEYorick Peterse2019-06-201-0/+17
| * | Backport dependency decisions from EEYorick Peterse2019-06-191-0/+7
| * | Backport EE YAML settings for PostgreSQLYorick Peterse2019-06-191-0/+9
* | | Merge branch '57973-errors-in-application-settings-panel-shows-wrong-panel' i...Sean McGivern2019-06-201-1/+1
|\ \ \
| * | | Update application settings using correct actionBrett Walker2019-06-191-1/+1
| |/ /
* | | Only support postgresqlNick Thomas2019-06-191-0/+4
|/ /
* | Removes database.yml.example file from config/removes-database-yml-exampleMayra Cabrera2019-06-181-0/+0
|/
* Merge branch 'dz-remove-deprecated-group-routes' into 'master'Grzegorz Bizon2019-06-181-8/+0
|\
| * Remove deprecated group routesdz-remove-deprecated-group-routesDmitriy Zaporozhets2019-06-141-8/+0
* | Merge branch 'bootstrap-to-glui' into 'master'Filipa Lacerda2019-06-181-0/+1
|\ \
| * | Import bootstrap styles from gitlab-uiSimon Knox2019-06-171-0/+1
* | | Merge branch 'config-application-differences' into 'master'Lin Jen-Shin2019-06-181-0/+30
|\ \ \ | |/ / |/| |
| * | Backport EE changes to config/application.rbconfig-application-differencesYorick Peterse2019-06-171-0/+30
| |/
* | [skip ci] Update doorkeeper.en.ymlPierre Tardy2019-06-171-1/+1
* | read_repository scope can be used for APIPierre Tardy2019-06-141-1/+1
|/
* Add back sidekiq metrics exporterrc/add_back_sidekiq_exporterRyan Cobb2019-06-131-0/+6
* Moved RackTimeout observer to a different locationJan Provaznik2019-06-121-1/+1
* Merge branch 'prom-api-1' into 'master'Sean McGivern2019-06-111-1/+1
|\
| * Named route for prometheus proxy_pathSimon Knox2019-06-061-1/+1
* | Add metric for measuring PumaWorkerKiller activityJan Provaznik2019-06-101-1/+0
* | Adds sidekiq worker label for ruby metricsRyan Cobb2019-06-061-6/+0
* | Add pages domains acme ordersVladimir Shushlin2019-06-061-0/+2
|/
* Allow BetterErrors REPL to be enabledashmckenzie/enable-better-errors-replAsh McKenzie2019-06-051-0/+3
* Introduce sidekiq worker for auto merge processintroduce-auto-merge-process-workerShinya Maeda2019-06-041-0/+1
* Merge dev.gitlab.org master into GitLab.com masterYorick Peterse2019-06-032-3/+52
|\
| * Protect Gitlab::HTTP against DNS rebinding attackDouwe Maan2019-05-302-3/+52
* | Abstract auto merge processesShinya Maeda2019-06-031-1/+1
* | Merge branch 'dz-scope-project-routes-3' into 'master'Lin Jen-Shin2019-05-311-40/+43
|\ \
| * | Move some project routes under - scopeDmitriy Zaporozhets2019-05-291-40/+43
* | | Send notifications to group-specific email addressWei-Meng Lee2019-05-311-1/+5
* | | Setup Phabricator importBob Van Landuyt2019-05-312-0/+3
* | | Build visual_review_toolbar with webpackSarah Groff Hennigh-Palermo2019-05-291-0/+58
View Lorry Controller Status