diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-12-15 16:32:34 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-12-15 16:32:34 +0000 |
| commit | 627a96875ee68e37b45192af3121f09032ea4bbf (patch) | |
| tree | 983781e7aaff8f50c0f81c27d9b352a63b3543cb /app/controllers | |
| parent | d2f313dcbccc1e3642fb0ccdf0849e0ef4ec8e21 (diff) | |
| parent | 4af9d592c500d2d97ec091d10ba860488c3702ea (diff) | |
| download | gitlab-ce-627a96875ee68e37b45192af3121f09032ea4bbf.tar.gz | |
Merge branch 'rc/use-factory_bot_rails' into 'master'
Replace factory_girl_rails with factory_bot_rails
See merge request gitlab-org/gitlab-ce!15919
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/notes_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index 627cb2bd93c..5940fae8dd0 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -11,7 +11,7 @@ class Projects::NotesController < Projects::ApplicationController # Controller actions are returned from AbstractController::Base and methods of parent classes are # excluded in order to return only specific controller related methods. # That is ok for the app (no :create method in ancestors) - # but fails for tests because there is a :create method on FactoryGirl (one of the ancestors) + # but fails for tests because there is a :create method on FactoryBot (one of the ancestors) # # see https://github.com/rails/rails/blob/v4.2.7/actionpack/lib/abstract_controller/base.rb#L78 # |