diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-07 15:09:49 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-07 15:09:49 +0000 |
| commit | f276d294878605e289c84beb53032b40c53ba961 (patch) | |
| tree | 20ca851593d31f5d5fabcaa15a23c9b607df04f5 /doc/development/gotchas.md | |
| parent | 100b1a03e603487ff1966f513ba1a177a8adaefd (diff) | |
| download | gitlab-ce-f276d294878605e289c84beb53032b40c53ba961.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/gotchas.md')
| -rw-r--r-- | doc/development/gotchas.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/development/gotchas.md b/doc/development/gotchas.md index 3d89a3a6c0a..2f8ff826358 100644 --- a/doc/development/gotchas.md +++ b/doc/development/gotchas.md @@ -14,7 +14,7 @@ might encounter or should avoid during development of GitLab CE and EE. In GitLab 10.8 and later, Omnibus has [dropped the `app/assets` directory](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/2456), after asset compilation. The `ee/app/assets`, `vendor/assets` directories are dropped as well. -This means that reading files from that directory will fail in Omnibus-installed GitLab instances: +This means that reading files from that directory fails in Omnibus-installed GitLab instances: ```ruby file = Rails.root.join('app/assets/images/logo.svg') @@ -243,8 +243,8 @@ end In this case, if for any reason the top level `ApplicationController` is loaded but `Projects::ApplicationController` is not, `ApplicationController` -would be resolved to `::ApplicationController` and then the `project` method will -be undefined and we will get an error. +would be resolved to `::ApplicationController` and then the `project` method is +undefined, causing an error. #### Solution @@ -265,7 +265,7 @@ By specifying `Projects::`, we tell Rails exactly what class we are referring to and we would avoid the issue. NOTE: -This problem will disappear as soon as we upgrade to Rails 6 and use the Zeitwerk autoloader. +This problem disappears as soon as we upgrade to Rails 6 and use the Zeitwerk autoloader. ### Further reading |