summaryrefslogtreecommitdiff
path: root/config/application.rb
Commit message (Collapse)AuthorAgeFilesLines
* Mysql fixes for Rails 5jprovazn-rails5-mysql-datetimeJan Provaznik2018-06-211-6/+11
| | | | | | | | | | * `MysqlDateTimeWithTimeZone` inherits from `ActiveRecord::Type::DateTime` (`MysqlDateTime` is not present in Rails 5) * explicitly set `NULL` default value for `merge_request_diff_files`'s `diff` column (otherwise empty string is used in a migration) and empty string is not allowed for text/blob fields in Mysql * disable NO_ZERO_DATE mode for all Mysql DB connections, otherwise SQL queries fail on inserting `0` value for `created_at` column
* [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
* [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
* [Rails5] Pass class references instead of strings to middleware builderblackst0ne-rails5-update-middlewaresblackst0ne2018-06-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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) ```
* Enforce UTF-8 encoding on user input in LogrageWithTimestamp formatter and ↵Imre Farkas2018-06-061-0/+2
| | | | filter out file content from logs
* Update 404 and 403 pagesPaul Slaughter2018-05-311-0/+1
|
* Optimize Emoji Sprite HandlingTim Zallmann2018-05-021-0/+1
|
* Merge branch '8088_embedded_snippets_support' into 'master'Grzegorz Bizon2018-04-161-0/+1
|\ | | | | | | | | | | | | Embedded Snippets Support Closes #8088 See merge request gitlab-org/gitlab-ce!15695
| * embedded snippets supporthaseeb2018-02-281-0/+1
| |
* | Force Rails to not complain about reloadingLin Jen-Shin2018-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same strategy with: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17810 See: https://stackoverflow.com/a/29710188/1992201 Frankly I don't really understand how this works and I don't really care either. However I tried it and it does the job. To try this, make sure you have pending migrations, and run the server, hit the site. It would tell you that there's pending migrations, and then run migrations, and then hit the site again. Without this patch, Rails would complain that "A copy of ...", with this patch, it works without problems.
* | Revert "Merge branch 'sh-filter-secret-variables' into 'master'"Stan Hu2018-03-131-2/+0
| | | | | | This reverts merge request !17159
* | Remove sync script for gitlab-svgs and reference the vendored library directlyMike Greiling2018-03-091-0/+6
| |
* | Add Gitlab.rails5? methodblackst0ne-add-rails5-methodblackst0ne2018-03-091-0/+6
| |
* | Projects and groups badges APIFrancisco Javier López2018-03-051-0/+1
|/
* Filter secret variable values from logsStan Hu2018-02-151-0/+2
| | | | | | | | | Right now Project::VariablesController users the `value` parameter to send the secret variable value. `value` is a pretty generic term and could be used in other controllers, but for now it's better to err on the side of caution and filter this out. Closes #43313
* Merge branch 'master' into jivl-update-katexJose Ivan Vargas2018-02-121-0/+1
|\
| * make sure there is a dependency on Gitlab::CurrentSettings isbw-fix-autoload-issueBrett Walker2018-02-091-0/+1
| | | | | | | | | | | | This fixes an issue where the Rails autoload system would throw various `Unable to autoload constant` errors (such as `Unable to autoload constant EE::ProjectsHelper`) when using the autoload system (such with `spring` or `reload!` in the rails console. This error was specifically ocurring in the EE code, however, it's seems reasonable to place the fix in CE as a general innoculation.
* | Merge branch 'master' into jivl-update-katexJose Ivan Vargas2018-02-051-3/+7
|\ \ | |/
| * Eliminate the last warning for redis wrapperLin Jen-Shin2018-01-261-0/+1
| |
| * Port some non-EE-specific config/ changes to CE42420-follow-up-from-resolve-asset-was-not-declared-to-be-precompiled-in-production-favicon-green-icoRémy Coutable2018-01-251-3/+3
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Adds Rubocop rule for line break around conditionals🙈 jacopo beschi 🙉2018-01-111-0/+1
| |
| * Filter out build traces from logged parametersStan Hu2018-01-111-0/+2
| |
* | Removed the katex precompile steps from the application configurationJose Ivan Vargas2017-12-211-2/+0
|/
* Merge branch 'rc/use-factory_bot_rails' into 'master'Robert Speicher2017-12-151-1/+1
|\ | | | | | | | | Replace factory_girl_rails with factory_bot_rails See merge request gitlab-org/gitlab-ce!15919
| * Replace factory_girl_rails with factory_bot_railsrc/use-factory_bot_railsRémy Coutable2017-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | I've followed the [upgrade guide](https://github.com/thoughtbot/factory_bot/blob/4-9-0-stable/UPGRADE_FROM_FACTORY_GIRL.md) and ran these two commands: ``` grep -e FactoryGirl **/*.rake **/*.rb -s -l | xargs sed -i "" "s|FactoryGirl|FactoryBot|" grep -e factory_girl **/*.rake **/*.rb -s -l | xargs sed -i "" "s|factory_girl|factory_bot|" ``` Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Add eager-load paths to autoload paths to fix Rake tasksNick Thomas2017-12-141-0/+4
|/ | | | | | | Rake doesn't respect eager-loading, so to avoid explicit requires we have to duplicate the eager-load config into the auto-load config. This backports an EE change made in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3706
* Add request throttlesMichael Kozono2017-11-171-1/+1
|
* Merge branch 'master' into bvl-group-treesBob Van Landuyt2017-10-101-0/+3
|\
| * Create idea of read-only databasetc-geo-read-only-ideaToon Claes2017-10-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | In GitLab EE, a GitLab instance can be read-only (e.g. when it's a Geo secondary node). But in GitLab CE it also might be useful to have the "read-only" idea around. So port it back to GitLab CE. Also having the principle of read-only in GitLab CE would hopefully lead to less errors introduced, doing write operations when there aren't allowed for read-only calls. Closes gitlab-org/gitlab-ce#37534.
* | Add a `WithPagination` concern to reuse across serializersBob Van Landuyt2017-10-041-0/+1
|/
* Load only the currently needed JS locale fileTim Zallmann2017-10-041-0/+1
|
* Move new nav into main CSS folderAnnabel Dunstone Gray2017-09-251-2/+0
|
* Expand filtered parameters to include `token`sh-filter-runner-tokenStan Hu2017-09-101-2/+2
| | | | | Now that we are logging API requests in `api_json.log`, we see that the runner token was not filtered properly.
* Filter additional secrets from Rails logsStan Hu2017-08-301-11/+4
| | | | | | | | | | | | | | Upon inspection of logs, there were a number of fields not filtered. For example: * authenticity_token: CSRF token * rss_token: Used for RSS feeds * secret: Used with Projects::UploadController Rails provides a way to match regexps, so we now filter: * Any parameter ending with `_token` * Any parameter containing `password` * Any parameter containing `secret`
* Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-081-1/+1
|
* Support references to group milestonesSean McGivern2017-08-071-0/+4
| | | | | Group milestones can only be referred to by name, not IID. They also do not support cross-project references.
* Backport to CE for:2902-standalone-ee-dir-ceLin Jen-Shin2017-08-041-2/+2
| | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2483
* Support multiple Redis instances based on queue typePaul Charlton2017-07-111-8/+10
|
* Merge branch 'feature/user-datetime-search-api-mysql' into 'master'Douwe Maan2017-07-071-1/+2
|\ | | | | | | | | | | | | Add creation time filters to user search API for admins Closes #29507 See merge request !12682
| * move CreatedAtFilter to concerns folderJames Lopez2017-07-071-1/+2
| |
* | Include new URL helpers retroactively into includers of Gitlab::Routingdm-fix-project-path-helpers-productionDouwe Maan2017-07-071-10/+4
|/
* Merge branch 'fix-routes-in-production-mode' into 'master'Douwe Maan2017-07-061-1/+5
|\ | | | | | | | | | | | | Fix shorter route helpers in production environment Closes #34741 See merge request !12675
| * Fix shorter route helpers in production environmentfix-routes-in-production-modeSean McGivern2017-07-061-1/+5
| | | | | | | | | | | | I don't know exactly when Rails picks each module to use, but this seems to be used by `app` in the console (for instance, `app.project_path` would fail before, but works now).
* | Improve & fix the performance bar UI and behaviorRémy Coutable2017-07-061-1/+1
|/
* Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-051-0/+20
|
* Resolve "Navigation - Move contextual navigation to sidebar"Annabel Dunstone Gray2017-06-281-0/+1
|
* Top navigation redesignPhil Hughes2017-06-211-0/+1
| | | | | | | Start of the new navigation by redesigning just the top navigation menu. This is only shown when a cookie is set. Part of #32794
* Fix vendor/peek.js so that it can be bundled with WebpackRémy Coutable2017-06-091-1/+0
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Small adjustmentsRémy Coutable2017-06-091-0/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* New performance bar that can be enabled with the `p b` shortcutRémy Coutable2017-06-091-0/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
View Lorry Controller Status