summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* [Rails5] Fix ActionCable's mount_path configurationblackst0ne-rails5-fix-action-cable-mount-pathblackst0ne2018-06-211-1/+1
| | | | | | | | | | | | | | | | | The original MR [1] fixed red specs for Rails 5. But while the failed specs were fixed, that changes brought new failed specs which weren't caught up in [1]. This commit just fixes the fix. :) New errors are like these: ``` Failed to upgrade to WebSocket (REQUEST_METHOD: GET, HTTP_CONNECTION: keep-alive, HTTP_UPGRADE: ) Finished "/-/boards/1/lists"[non-WebSocket] for 127.0.0.1 at 2018-06-20 18:09:26 +0200 ``` [1]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20015
* Merge branch ↵Rémy Coutable2018-06-201-0/+7
|\ | | | | | | | | | | | | | | | | 'blackst0ne-rails5-found-new-routes-that-could-cause-conflicts-with-existing-namespaced-routes' into 'master' Resolve "[Rails5] Found new routes that could cause conflicts with existing namespaced routes" Closes #48010 See merge request gitlab-org/gitlab-ce!20015
| * [Rails5] Fix ActionCable '/cable' mountpoint conflictblackst0ne-rails5-found-new-routes-that-could-cause-conflicts-with-existing-namespaced-routesblackst0ne2018-06-201-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Rails 5.0 the new framework has been added. It's called ActionCable. It brings WebSockets support to rails applications. By default the mountpoint of WebSocket requests is `/cable` [1]. GitLab allows using top level names as namespaces or usernames. For example, `gitlab.com/cable` at this moment leads to a user with the nickname `cable`. This commit changes ActionCable's mountpoint to a reserved top level word `-`. This is just a stub and should not be be used in real work. Please set correct mountpoints for each environments when configuring ActionCable for real using. [1]: https://github.com/rails/rails/blob/5-0-stable/actioncable/lib/action_cable.rb#L38
* | More gitaly disk access blocksJacob Vosmaer (GitLab)2018-06-202-0/+2
|/
* Redirect favicon.(png|ico) to actual favicon asset or uploaddm-favicon-redirectDouwe Maan2018-06-181-0/+6
|
* [Rails5] Fix optimistic lock valueblackst0ne2018-06-151-52/+59
| | | | Update the monkey-patch to make it work in Rails 5.
* Merge branch 'rails5-database' into 'master'Sean McGivern2018-06-141-0/+10
|\ | | | | | | | | | | | | Fix table_exists? to be Rails5 compatible Closes #45107 See merge request gitlab-org/gitlab-ce!19418
| * Use data_source_exists? instead of table_exists?rails5-databaseJarka Kadlecová2018-06-141-0/+10
| | | | | | | | Use data_source_exists? where possible instead of table_exists? in order to be Rails5 compatible
* | [Rails5] Pass class references instead of strings to middleware builderblackst0ne-rails5-update-middlewaresblackst0ne2018-06-132-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It fixes Rails 5.0 deprecation flooding like: ``` DEPRECATION WARNING: Passing strings or symbols to the middleware builder is deprecated, please change them to actual class references. For example: "::Gitlab::Middleware::ReadOnly" => Gitlab::Middleware::ReadOnly (called from <top (required)> at /builds/gitlab-org/gitlab-ce/config/environment.rb:11) DEPRECATION WARNING: Passing strings or symbols to the middleware builder is deprecated, please change them to actual class references. For example: "ActionDispatch::Static" => ActionDispatch::Static (called from <top (required)> at /builds/gitlab-org/gitlab-ce/config/environment.rb:11) DEPRECATION WARNING: Passing strings or symbols to the middleware builder is deprecated, please change them to actual class references. For example: "Gitlab::Testing::RequestBlockerMiddleware" => Gitlab::Testing::RequestBlockerMiddleware (called from <top (required)> at /builds/gitlab-org/gitlab-ce/config/environment.rb:11) DEPRECATION WARNING: Passing strings or symbols to the middleware builder is deprecated, please change them to actual class references. For example: "ActionDispatch::Static" => ActionDispatch::Static (called from <top (required)> at /builds/gitlab-org/gitlab-ce/config/environment.rb:11) DEPRECATION WARNING: Passing strings or symbols to the middleware builder is deprecated, please change them to actual class references. For example: "Gitlab::Testing::RequestInspectorMiddleware" => Gitlab::Testing::RequestInspectorMiddleware (called from <top (required)> at /builds/gitlab-org/gitlab-ce/config/environment.rb:11) ```
* | Merge branch 'sh-update-unicorn-rb-example' into 'master'Robert Speicher2018-06-121-0/+11
|\ \ | | | | | | | | | | | | Clean up stale Prometheus metrics in before_exec unicorn hook See merge request gitlab-org/gitlab-ce!19683
| * | Clean up stale Prometheus metrics in before_exec unicorn hooksh-update-unicorn-rb-exampleStan Hu2018-06-111-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Issuing a SIGUSR2 to a unicorn involves a dance where new workers are spun up before the old ones are shut down. To ensure Prometheus .db files aren't deleted after the new workers are shut down, we need to clean these files up before the unicorn process is run. Relates to https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/2582
* | | Resolve "[Rails5] `ActionView::MissingTemplate` in ↵blackst0ne2018-06-121-1/+1
|/ / | | | | | | spec/features/projects/wiki/user_views_wiki_page_spec.rb"
* | Merge branch 'leipert-add-memory-info' into 'master'Tim Zallmann2018-06-111-1/+0
|\ \ | | | | | | | | | | | | Set `max_old_space_size` option of node to 3.5GB during compile:assets See merge request gitlab-org/gitlab-ce!19624
| * | set max_old_space_size to 3.5 GB for compile-assets jobLukas Eipert2018-06-111-1/+0
| | |
* | | Add missing `:comment` attributeJan Provaznik2018-06-101-1/+6
|/ / | | | | | | In Rails 5 IndexDefinition contains also `:comment` attribute.
* | Merge branch ↵Douwe Maan2018-06-081-1/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '5974-geo-unauthenticated-rate-limits-should-not-block-geo-requests' into 'master' Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5876/ Closes #5974 See merge request gitlab-org/gitlab-ce!19189
| * | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/58765974-geo-unauthenticated-rate-limits-should-not-block-geo-requestsValery Sizov2018-05-291-1/+5
| | |
* | | Merge branch '44331-upgrade-monaco-editor-and-remove-copywebpackplugin' into ↵2018-06-07-code-freeze-ee2018-06-07-code-freezeTim Zallmann2018-06-082-32/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Upgrade Monaco editor and remove CopyWebpackPlugin" Closes #44331 See merge request gitlab-org/gitlab-ce!17813
| * | | approve @webassemblyjs packages (MIT license)Mike Greiling2018-06-081-0/+6
| | | |
| * | | add monaco-editor-webpack-plugin and update webpack configMike Greiling2018-06-071-32/+4
| | | |
* | | | Merge branch 'jl-update-error-rate-to-percent' into 'master'Mike Greiling2018-06-071-4/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Update NGINX error rate to a percentage See merge request gitlab-org/gitlab-ce!19471
| * | | Update NGINX error rate to a percentageJoshua Lambert2018-06-061-4/+4
| | | |
* | | | Merge branch 'feature/customizable-favicon' into 'master'Douwe Maan2018-06-075-1/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Customizable favicon Closes #15661 See merge request gitlab-org/gitlab-ce!14497
| * | | | force minimagick to use graphicsmagickAlexis Reigel2018-06-051-0/+3
| | | | |
| * | | | whitelist allowed file types for custom faviconsAlexis Reigel2018-06-051-0/+14
| | | | |
| * | | | register ico mime typeAlexis Reigel2018-06-051-0/+2
| | | | | | | | | | | | | | | | | | | | `#send_file` won't properly set the favicon's content type otherwise.
| * | | | allow uploading favicon in appearance settingsAlexis Reigel2018-06-052-1/+2
| |/ / /
* | | | Merge branch '44790-disabled-emails-logging' into 'master'Sean McGivern2018-06-071-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop logging email information when emails are disabled Closes #44790 See merge request gitlab-org/gitlab-ce!18521
| * | | | 44790: Disable the action mailer base logging when emails are disabledMarc Shaw2018-06-031-1/+4
| | | | |
* | | | | Merge branch '45505-lograge_formatter_encoding' into 'master'Kamil Trzciński2018-06-071-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enforce UTF-8 encoding on user input in LogrageWithTimestamp formatter Closes #45505 See merge request gitlab-org/gitlab-ce!19244
| * | | | | Enforce UTF-8 encoding on user input in LogrageWithTimestamp formatter and ↵Imre Farkas2018-06-061-0/+2
| | |/ / / | |/| | | | | | | | | | | | | filter out file content from logs
* | | | | Merge branch 'sh-log-422-responses' into 'master'2018-06-07-RC-cutSean McGivern2018-06-071-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Log response body to production_json.log when a controller responds with a 422 status See merge request gitlab-org/gitlab-ce!19473
| * | | | | Log response body to production_json.log when a controller responds with a ↵Stan Hu2018-06-061-0/+1
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 422 status We have a number of import errors occurring with 422 errors, and it's hard to determine why they are happening. This change will surface the errors in the log lines. Relates to #47365
* | | | | Resolve "Introduce new navigation themes in GitLab 11.0"Annabel Gray2018-06-071-3/+8
|/ / / /
* | | | Merge branch 'live-trace-v2-persist-data' into 'master'Kamil Trzciński2018-06-061-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Live trace: Rescue stale live trace See merge request gitlab-org/gitlab-ce!18680
| * | | | Rename worker to ArchiveTracesCronWorkerShinya Maeda2018-06-061-3/+3
| | | | |
| * | | | Fix name of worker for cron worker specShinya Maeda2018-06-061-1/+1
| | | | |
| * | | | Rename find_stale. Fix worker name in declaration.Shinya Maeda2018-06-061-3/+3
| | | | |
| * | | | Changed cron interval to every 17 minuteShinya Maeda2018-06-061-1/+1
| | | | |
| * | | | Change cron period to per hourShinya Maeda2018-06-061-1/+1
| | | | |
| * | | | Simplify RescueStaleLiveTraceWorkerShinya Maeda2018-06-061-2/+2
| | | | |
| * | | | Added flush-to-db process for the cron worker. Rename to ↵Shinya Maeda2018-06-061-3/+3
| | | | | | | | | | | | | | | | | | | | RescueStaleLiveTraceWorker.
| * | | | Rescue stale live tracesShinya Maeda2018-06-061-0/+3
| |/ / /
* | | | Initial setup GraphQL using graphql-ruby 1.8Bob Van Landuyt2018-06-061-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - All definitions have been replaced by classes: http://graphql-ruby.org/schema/class_based_api.html - Authorization & Presentation have been refactored to work in the class based system - Loaders have been replaced by resolvers - Times are now coersed as ISO 8601
* | | | Convert from GraphQL::Batch to BatchLoaderNick Thomas2018-06-051-6/+0
| | | |
* | | | Add a minimal GraphQL APINick Thomas2018-06-052-0/+9
|/ / /
* | | Merge branch 'rails5-fix-46236' into 'master'Yorick Peterse2018-06-051-1/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Support rails5 in postgres indexes function and fix some migrations Closes #46236 See merge request gitlab-org/gitlab-ce!19400
| * | | Support rails5 in postgres indexes function and fix some migrationsJasper Maes2018-06-051-1/+8
| | | |
* | | | Update validatorpresigned-multipart-uploadsKamil Trzciński2018-06-041-9/+15
| | | |
* | | | Support presigned multipart uploadsKamil Trzciński2018-06-042-7/+13
|/ / /
View Lorry Controller Status