summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Fix attr_encryption key settingsStan Hu2018-06-021-8/+15
* Add comment about the need for truncating keys in Ruby 2.4sh-add-ruby-2.4-commentStan Hu2018-06-011-0/+7
* Merge branch 'sh-bump-ruby-2.4' into 'master'Stan Hu2018-06-012-0/+7
|\
| * Upgrade to Ruby 2.4.4sh-bump-ruby-2.4Stan Hu2018-05-292-0/+7
* | Add "deny disk access" Gitaly feature (tripswitch)Jacob Vosmaer (GitLab)2018-06-012-6/+10
* | Merge branch '46481-preserve-warnings-even-if-passed' into 'master'Douwe Maan2018-06-012-9/+2
|\ \
| * | Introduce Gitlab::Auth.omniauth_setup_providersLin Jen-Shin2018-06-011-7/+1
| * | Eliminate constants warnings by:Lin Jen-Shin2018-06-012-6/+5
* | | Merge branch 'add-moneky-patch-for-using-stream-upload-with-carrierwave' into...Kamil Trzciński2018-06-011-0/+69
|\ \ \
| * | | Revise commentsadd-moneky-patch-for-using-stream-upload-with-carrierwaveShinya Maeda2018-05-281-3/+2
| * | | Clean up patchShinya Maeda2018-05-281-9/+31
| * | | Fix rubocop namespaceShinya Maeda2018-05-281-5/+5
| * | | Reload remote file the cacheds file is already removedShinya Maeda2018-05-281-0/+3
| * | | Use prepend to correctly use the monketpatch's methodShinya Maeda2018-05-281-24/+28
| * | | Fix static analysisShinya Maeda2018-05-281-5/+5
| * | | Add a monkey pach of https://github.com/carrierwaveuploader/carrierwave/pull/...Shinya Maeda2018-05-281-0/+41
* | | | Update 404 and 403 pagesPaul Slaughter2018-05-311-0/+1
| |/ / |/| |
* | | Export assigned issues in iCalendar feedImre Farkas2018-05-314-2/+5
* | | better handle a missing gitlab-shell versionBrett Walker2018-05-301-2/+2
* | | Merge branch 'sh-use-grape-path-helpers' into 'master'Sean McGivern2018-05-301-51/+0
|\ \ \
| * | | Replace grape-route-helpers with our own grape-path-helpersStan Hu2018-05-301-51/+0
| | |/ | |/|
* | | Add `shared_projects` endpointBob Van Landuyt2018-05-291-0/+1
|/ /
* | 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
View Lorry Controller Status