summaryrefslogtreecommitdiff
path: root/spec/controllers/concerns
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-19 00:08:01 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-19 00:08:01 +0000
commit1caa60060b2f9e3417ab335e2f1dea1064163434 (patch)
tree01c0d5825bd345ee625bb70b7433c6e10307fcce /spec/controllers/concerns
parent7f8330873c1a5860b8a9a52d111083a65d210249 (diff)
downloadgitlab-ce-1caa60060b2f9e3417ab335e2f1dea1064163434.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/concerns')
-rw-r--r--spec/controllers/concerns/continue_params_spec.rb1
-rw-r--r--spec/controllers/concerns/internal_redirect_spec.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/spec/controllers/concerns/continue_params_spec.rb b/spec/controllers/concerns/continue_params_spec.rb
index b4b62cbe1e3..6af01aa837c 100644
--- a/spec/controllers/concerns/continue_params_spec.rb
+++ b/spec/controllers/concerns/continue_params_spec.rb
@@ -12,6 +12,7 @@ describe ContinueParams do
end
end
end
+
subject(:controller) { controller_class.new }
def strong_continue_params(params)
diff --git a/spec/controllers/concerns/internal_redirect_spec.rb b/spec/controllers/concerns/internal_redirect_spec.rb
index e5e50cfd55e..cc6422f2817 100644
--- a/spec/controllers/concerns/internal_redirect_spec.rb
+++ b/spec/controllers/concerns/internal_redirect_spec.rb
@@ -12,6 +12,7 @@ describe InternalRedirect do
end
end
end
+
subject(:controller) { controller_class.new }
describe '#safe_redirect_path' do