diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-29 06:06:14 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-29 06:06:14 +0000 |
commit | acdf997e1abea2d1f7b6964b19ee493b1e7c051d (patch) | |
tree | 8af0f845d08624945cbfa9cca329fe33dfe81a9b /spec/routing | |
parent | a5eef71805f791dac4ce14a30ca6b59ee31295c8 (diff) | |
download | gitlab-ce-acdf997e1abea2d1f7b6964b19ee493b1e7c051d.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/routing')
-rw-r--r-- | spec/routing/admin_routing_spec.rb | 2 | ||||
-rw-r--r-- | spec/routing/environments_spec.rb | 2 | ||||
-rw-r--r-- | spec/routing/group_routing_spec.rb | 2 | ||||
-rw-r--r-- | spec/routing/import_routing_spec.rb | 2 | ||||
-rw-r--r-- | spec/routing/notifications_routing_spec.rb | 2 | ||||
-rw-r--r-- | spec/routing/openid_connect_spec.rb | 2 | ||||
-rw-r--r-- | spec/routing/project_routing_spec.rb | 2 | ||||
-rw-r--r-- | spec/routing/routing_spec.rb | 2 |
8 files changed, 16 insertions, 0 deletions
diff --git a/spec/routing/admin_routing_spec.rb b/spec/routing/admin_routing_spec.rb index 77baaef7afd..a82bdfe3ce8 100644 --- a/spec/routing/admin_routing_spec.rb +++ b/spec/routing/admin_routing_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' # block_admin_user PUT /admin/users/:id/block(.:format) admin/users#block diff --git a/spec/routing/environments_spec.rb b/spec/routing/environments_spec.rb index 28b3e79c1ff..ea172698764 100644 --- a/spec/routing/environments_spec.rb +++ b/spec/routing/environments_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe 'environments routing' do diff --git a/spec/routing/group_routing_spec.rb b/spec/routing/group_routing_spec.rb index c6b101ae908..2a8454a276d 100644 --- a/spec/routing/group_routing_spec.rb +++ b/spec/routing/group_routing_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe "Groups", "routing" do diff --git a/spec/routing/import_routing_spec.rb b/spec/routing/import_routing_spec.rb index 3fdede7914d..7e78a1c0cd2 100644 --- a/spec/routing/import_routing_spec.rb +++ b/spec/routing/import_routing_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' # Shared examples for a resource inside a Project diff --git a/spec/routing/notifications_routing_spec.rb b/spec/routing/notifications_routing_spec.rb index 54ed87b5520..8c2b29aabcb 100644 --- a/spec/routing/notifications_routing_spec.rb +++ b/spec/routing/notifications_routing_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "spec_helper" describe "notifications routing" do diff --git a/spec/routing/openid_connect_spec.rb b/spec/routing/openid_connect_spec.rb index 2c3bc08f1a1..70470032930 100644 --- a/spec/routing/openid_connect_spec.rb +++ b/spec/routing/openid_connect_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' # oauth_discovery_keys GET /oauth/discovery/keys(.:format) doorkeeper/openid_connect/discovery#keys diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb index 3e57bb70287..741a981a3b1 100644 --- a/spec/routing/project_routing_spec.rb +++ b/spec/routing/project_routing_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe 'project routing' do diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb index 1b982fa7744..e8333232b90 100644 --- a/spec/routing/routing_spec.rb +++ b/spec/routing/routing_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' # user GET /users/:username/ |