summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Upgrade to Ruby 2.4.4sh-bump-ruby-2.4Stan Hu2018-05-292-0/+7
| | | | | | | | | | | | Fixes that make this work: * A change in Ruby (https://github.com/ruby/ruby/commit/ce635262f53b760284d56bb1027baebaaec175d1) requires passing in the exact required length for OpenSSL keys and IVs. * Ensure the secrets.yml is generated before any prepended modules are loaded. This is done by renaming the `secret_token.rb` initializer to `01_secret_token.rb`, which is a bit ugly but involves the least impact on other files.
* Merge branch '45190-create-notes-diff-files' into 'master'Douwe Maan2018-05-281-0/+1
|\ | | | | | | | | | | | | Persist and use truncated note diffs instead requesting Gitaly in a N+1 manner on MR page Closes #45190 See merge request gitlab-org/gitlab-ce!18991
| * Persist truncated note diffs on a new table45190-create-notes-diff-filesOswaldo Ferreira2018-05-241-0/+1
| | | | | | | | | | We request Gitaly in a N+1 manner to build discussion diffs. Once the diffs are from different revisions, it's hard to make a single request to the service in order to build the whole response. With this change we solve this problem and simplify a lot fetching this piece of info.
* | Merge branch '46600-fix-gitlab-revision-when-not-in-git-repo' into 'master'Rémy Coutable2018-05-252-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Resolve "gitlab 10.8 assumes that installation is a git working copy." Closes #46600 See merge request gitlab-org/gitlab-ce!19125
| * | Replace Gitlab::REVISION with Gitlab.revision and handle installations ↵46600-fix-gitlab-revision-when-not-in-git-repoRémy Coutable2018-05-242-2/+2
| |/ | | | | | | | | | | without a .git directory Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'sh-disable-background-metrics-in-tests' into 'master'Robert Speicher2018-05-241-1/+1
|\ \ | | | | | | | | | | | | Disable the background Prometheus sampler in tests See merge request gitlab-org/gitlab-ce!19130
| * | Disable the background Prometheus sampler in testssh-disable-background-metrics-in-testsStan Hu2018-05-241-1/+1
| |/ | | | | | | | | This sampler can interfere with tests and cause transient build failures, such as https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/70241683.
* | 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 config Closes #46741 See merge request gitlab-org/gitlab-ce!19131
| * Add `Access-Control-Allow-Headers` to Webpack Dev Server configKushal Pandya2018-05-241-1/+4
| |
* | Merge branch ↵Douwe Maan2018-05-231-3/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '45175-cache-json-instead-of-activerecord-objects-in-appearance-and-applicationsetting' into 'master' Resolve "Cache JSON instead of ActiveRecord objects in `Appearance` and `ApplicationSetting`" Closes #45175 See merge request gitlab-org/gitlab-ce!18754
| * | Don't expire the current ApplicationSetting in config/initializers/1_settings.rbRémy Coutable2018-05-231-3/+0
| |/ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '46259-prometheus-integration-fails-on-kube-1-10' into 'master'Rémy Coutable2018-05-231-0/+16
|\ \ | |/ |/| | | | | | | | | Resolve "Prometheus integration fails on k8s 1.10" Closes #46259 See merge request gitlab-org/gitlab-ce!19082
| * 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 ↵Tiago Botelho2018-05-221-0/+15
| | | | | | | | with version 1.10 of kubernetes API
* | 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
|\ | | | | | | | | | | | | Resolve "Upgrade vue-loader for bug fixes and a simpler webpack config" Closes #45532 See merge request gitlab-org/gitlab-ce!19052
| * 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
|/ | | | | | | Also, don't use the provided Middleware, which isn't thread-safe, and instantiate a new Flipper instance per thread instead. Signed-off-by: Rémy Coutable <remy@rymai.me>
* 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
| | | | | Current logging tells us we've isolated the calls to about 5 call sites, now we'd like to know what is calling these methods.
* Merge branch 'zj-validation-initializer' into 'master'Kamil Trzciński2018-05-111-11/+0
|\ | | | | | | | | Remove method call to deprecated method See merge request gitlab-org/gitlab-ce!18815
| * Remove method call to deprecated methodZeger-Jan van de Weg2018-05-111-11/+0
| | | | | | | | | | Given the settings initializer creates Gitaly Storage Settings objects already, the calls to path can be moved to that initializer.
* | Fix finding wiki pages when they have invalidly-encoded contentAhmad Sherif2018-05-091-0/+14
|/ | | | Fixes #43715
* Merge branch 'upgrade-to-webpack-v4' into 'master'Clement Ho2018-05-073-115/+89
|\ | | | | | | | | | | | | Upgrade to Webpack 4 Closes #43400 See merge request gitlab-org/gitlab-ce!17218
| * Merge branch 'master' into upgrade-to-webpack-v4Mike Greiling2018-05-0711-18/+67
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (252 commits) Upgrade underscore.js Enable prometheus metrics by default Add signature verification badge to compare view Add Changelog Update instalation from source guide fix Web IDE file tree scroll issue Enable quick support actions default Backport of 4084-epics-username-autocomplete Remove top margin on the terms page with performance bar Backports every CE related change from ee-44542 to CE Fix typo in changelog entry fix missing space Backport IdentityLinker#failed? from GroupSaml callback flow Add ci_cd_settings delete_all dependency on project AutoDevOps Docs fix invalid external link Ignore knapsack and rspec_flaky Ensure web hook 'blocked URL' errors are stored in as web hook logs and properly surfaced to the user Partially revert ebcd5711c5ff937bf925002bf9a5b636b037684e to fix runner pages Reuses `InternalRedirect` when possible Enforces terms in the web application ...
| * | 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 ↵Mike Greiling2018-05-011-2/+18
| | | | | | | | | | | | bundles for each
| * | 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
|\ \ \ | | | | | | | | | | | | | | | | Improve UX For Group Runners See merge request gitlab-org/gitlab-ce!18649
| * | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE backport of Backports Push Mirrors to CE Closes #42099 See merge request gitlab-org/gitlab-ce!18715
| * | | | 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 names Closes #45163 See merge request gitlab-org/gitlab-ce!18770
| * | | | 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 scope Closes gitlab-ee#5857 See merge request gitlab-org/gitlab-ce!18771
| * | | 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
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Resolve "CI retry/cancel job or pipeline redirect the user and can't be open in a new tab" Closes #33697 See merge request gitlab-org/gitlab-ce!18451
| * | Merge branch 'master' into 33697-pipelines-json-endpointMatija Čupić2018-05-025-31/+88
| |\ \
View Lorry Controller Status