diff options
| author | Marcel Amirault <mamirault@gitlab.com> | 2019-07-10 05:56:23 +0000 |
|---|---|---|
| committer | Marcel Amirault <mamirault@gitlab.com> | 2019-07-10 05:56:23 +0000 |
| commit | 2b03a0c2cf699074ec37a863e5c752a2cab2b133 (patch) | |
| tree | 7ebc289d2ec498fcebf8ae454cdb1eb1ef500dbd /app/controllers/graphql_controller.rb | |
| parent | c0deda7a86796c5de6ebe376c83f55af0965bde3 (diff) | |
| parent | 810df4fb51bf3db4016c5f7458599331d4586300 (diff) | |
| download | gitlab-ce-docs-hard-tabs.tar.gz | |
Merge branch 'master' into 'docs-hard-tabs'docs-hard-tabs
# Conflicts:
# doc/administration/pseudonymizer.md
# doc/administration/uploads.md
Diffstat (limited to 'app/controllers/graphql_controller.rb')
| -rw-r--r-- | app/controllers/graphql_controller.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/app/controllers/graphql_controller.rb b/app/controllers/graphql_controller.rb index 1ce0afac83b..9fbbe373b0d 100644 --- a/app/controllers/graphql_controller.rb +++ b/app/controllers/graphql_controller.rb @@ -11,7 +11,6 @@ class GraphqlController < ApplicationController # around in GraphiQL. protect_from_forgery with: :null_session, only: :execute - before_action :check_graphql_feature_flag! before_action :authorize_access_api! before_action(only: [:execute]) { authenticate_sessionless_user!(:api) } @@ -86,8 +85,4 @@ class GraphqlController < ApplicationController render json: error, status: status end - - def check_graphql_feature_flag! - render_404 unless Gitlab::Graphql.enabled? - end end |