diff options
author | Robert Speicher <robert@gitlab.com> | 2018-05-29 19:20:40 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2018-05-29 19:20:40 +0000 |
commit | ff575b782e53e42a85ebfe65a559864f45c848b1 (patch) | |
tree | 4b5deca3a45b26214cf29682ecdb900de8531a83 /app/controllers | |
parent | 4aae86f6f71ab381de1d987a04d5e9c250cd2080 (diff) | |
parent | 9471c3f673abab7b3179c1dc2931a2c44aa1f3a2 (diff) | |
download | gitlab-ce-ff575b782e53e42a85ebfe65a559864f45c848b1.tar.gz |
Merge branch '6045-extract-ee-specific-specs-lines' into 'master'
[CE] Resolve "Extract EE specific files/lines for some controller specs"
Closes #6045
See merge request gitlab-org/gitlab-ce!19089
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/projects/clusters_controller.rb | 13 | ||||
-rw-r--r-- | app/controllers/projects/environments_controller.rb | 10 |
2 files changed, 10 insertions, 13 deletions
diff --git a/app/controllers/projects/clusters_controller.rb b/app/controllers/projects/clusters_controller.rb index aeaba3a0acf..d58039b7d42 100644 --- a/app/controllers/projects/clusters_controller.rb +++ b/app/controllers/projects/clusters_controller.rb @@ -71,19 +71,6 @@ class Projects::ClustersController < Projects::ApplicationController .present(current_user: current_user) end - def create_params - params.require(:cluster).permit( - :enabled, - :name, - :provider_type, - provider_gcp_attributes: [ - :gcp_project_id, - :zone, - :num_nodes, - :machine_type - ]) - end - def update_params if cluster.managed? params.require(:cluster).permit( diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb index 52d528e816e..0821362f5df 100644 --- a/app/controllers/projects/environments_controller.rb +++ b/app/controllers/projects/environments_controller.rb @@ -7,6 +7,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController before_action :authorize_admin_environment!, only: [:terminal, :terminal_websocket_authorize] before_action :environment, only: [:show, :edit, :update, :stop, :terminal, :terminal_websocket_authorize, :metrics] before_action :verify_api_request!, only: :terminal_websocket_authorize + before_action :expire_etag_cache, only: [:index] def index @environments = project.environments @@ -148,6 +149,15 @@ class Projects::EnvironmentsController < Projects::ApplicationController Gitlab::Workhorse.verify_api_request!(request.headers) end + def expire_etag_cache + return if request.format.json? + + # this forces to reload json content + Gitlab::EtagCaching::Store.new.tap do |store| + store.touch(project_environments_path(project, format: :json)) + end + end + def environment_params params.require(:environment).permit(:name, :external_url) end |