summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '45190-create-notes-diff-files' into 'master'Douwe Maan2018-05-281-0/+1
|\
| * Persist truncated note diffs on a new table45190-create-notes-diff-filesOswaldo Ferreira2018-05-241-0/+1
* | Merge branch '46600-fix-gitlab-revision-when-not-in-git-repo' into 'master'Rémy Coutable2018-05-252-2/+2
|\ \
| * | Replace Gitlab::REVISION with Gitlab.revision and handle installations withou...46600-fix-gitlab-revision-when-not-in-git-repoRémy Coutable2018-05-242-2/+2
| |/
* | Merge branch 'sh-disable-background-metrics-in-tests' into 'master'Robert Speicher2018-05-241-1/+1
|\ \
| * | Disable the background Prometheus sampler in testssh-disable-background-metrics-in-testsStan Hu2018-05-241-1/+1
| |/
* | Merge branch '46741-add-access-control-allow-headers-wds' into 'master'Mike Greiling2018-05-241-1/+4
|\ \ | |/ |/|
| * Add `Access-Control-Allow-Headers` to Webpack Dev Server configKushal Pandya2018-05-241-1/+4
* | Merge branch '45175-cache-json-instead-of-activerecord-objects-in-appearance-...Douwe Maan2018-05-231-3/+0
|\ \
| * | Don't expire the current ApplicationSetting in config/initializers/1_settings.rbRémy Coutable2018-05-231-3/+0
| |/
* | Merge branch '46259-prometheus-integration-fails-on-kube-1-10' into 'master'Rémy Coutable2018-05-231-0/+16
|\ \ | |/ |/|
| * Fix rubocop46259-prometheus-integration-fails-on-kube-1-10Tiago Botelho2018-05-231-0/+1
| * Monkey patches Kubeclient::Client#proxy_url in order to make it compliant wit...Tiago Botelho2018-05-221-0/+15
* | add file cache to vue-loader to speed up compilation46603-add-vue-loader-cacheMike Greiling2018-05-221-1/+14
|/
* Merge branch '45532-upgrade-vue-loader' into 'master'Phil Hughes2018-05-221-102/+94
|\
| * simplify and reorganize webpack config45532-upgrade-vue-loaderMike Greiling2018-05-181-98/+88
| * move devtool setting into main config objectMike Greiling2018-05-181-3/+2
| * upgrade to vue-loader 15.0.11 and update webpack configMike Greiling2018-05-181-4/+7
* | Ensure Flipper memoizer is used in Sidekiq's context45528-repeated-calls-to-redis-for-flipper-feature-flagRémy Coutable2018-05-181-21/+0
|/
* Conditionally add Gitaly deprecation warnings based on ENV variableStan Hu2018-05-171-1/+1
* More verbose logging for deprecated path accessZeger-Jan van de Weg2018-05-141-2/+6
* Merge branch 'zj-validation-initializer' into 'master'Kamil Trzciński2018-05-111-11/+0
|\
| * Remove method call to deprecated methodZeger-Jan van de Weg2018-05-111-11/+0
* | Fix finding wiki pages when they have invalidly-encoded contentAhmad Sherif2018-05-091-0/+14
|/
* Merge branch 'upgrade-to-webpack-v4' into 'master'Clement Ho2018-05-073-115/+89
|\
| * Merge branch 'master' into upgrade-to-webpack-v4Mike Greiling2018-05-0711-18/+67
| |\
| * | consolidate main bootstrap entriesMike Greiling2018-05-061-1/+1
| * | remove unused name-all-modules-pluginMike Greiling2018-05-041-1/+0
| * | truncate long chunkhashes within filenamesMike Greiling2018-05-041-6/+6
| * | add better filename template to worker-loaderMike Greiling2018-05-031-1/+9
| * | adjust IDE page loading config to ensure web workers are not loaded cross-originMike Greiling2018-05-031-10/+2
| * | update several packages to remove deprecation warningsMike Greiling2018-05-011-21/+21
| * | combine ancestor entrypoints into child entrypoints instead of importing bund...Mike Greiling2018-05-011-2/+18
| * | move dev server middleware to new namespaceMike Greiling2018-05-011-1/+1
| * | temporarily disable deterministic chunk hash logicMike Greiling2018-05-011-44/+0
| * | adjust webpack configMike Greiling2018-05-012-37/+40
* | | Merge branch '10244-ux-improvements-for-group-runners' into 'master'Kamil Trzciński2018-05-071-0/+7
|\ \ \
| * | | Allow to pause,resume,show,edit,destroy group runners (#10244)Dylan Griffith2018-05-071-0/+7
* | | | Merge branch '42099-port-push-mirroring-to-ce-ce-port-v-2' into 'master'Douwe Maan2018-05-072-0/+9
|\ \ \ \
| * | | | Adds remote mirror table migrationTiago Botelho2018-05-071-0/+6
| * | | | Backports every CE related change from ee-5484 to CETiago Botelho2018-05-071-0/+3
| | |_|/ | |/| |
* | | | Merge branch 'jl-fix-nginx-metrics' into 'master'Mike Greiling2018-05-071-6/+6
|\ \ \ \
| * | | | Fix nginx metric namesJoshua Lambert2018-05-071-6/+6
| | |/ / | |/| |
* | | | Merge branch 'dm-warden-hook-scope' into 'master'Grzegorz Bizon2018-05-071-5/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Only run session related Warden hooks for user scopeDouwe Maan2018-05-071-5/+5
| |/ /
* | | Enable prometheus metrics by defaultFelipe Artur2018-05-071-1/+8
* | | Add signature verification badge to compare viewMarc2018-05-071-0/+1
* | | Merge branch '33697-pipelines-json-endpoint' into 'master'Kamil Trzciński2018-05-071-0/+1
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' into 33697-pipelines-json-endpointMatija Čupić2018-05-025-31/+88
| |\ \
| * | | Add stages_ajax endpoint to serve old HTMLKamil Trzciński2018-05-021-0/+1
View Lorry Controller Status