diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2016-03-17 12:37:57 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2016-03-17 12:37:57 +0000 |
commit | 1004638c7122a979ec6fb7cab46b1f3f820401b8 (patch) | |
tree | f6422f314d9fa3f3a61230874fcde73b8ba15140 | |
parent | 4171933c0963696626c879c2d05afa1594a71d99 (diff) | |
parent | 019fed0f72116a73f0d410fe0c892fc9a19921e7 (diff) | |
download | gitlab-ce-1004638c7122a979ec6fb7cab46b1f3f820401b8.tar.gz |
Merge branch 'fix/reuse-existing-no-cache-method' into 'master'
Reuse `no_cache_headers` method in badges controller
Closes #14100
See merge request !3269
-rw-r--r-- | app/controllers/projects/badges_controller.rb | 13 | ||||
-rw-r--r-- | features/steps/project/badges/build.rb | 2 |
2 files changed, 2 insertions, 13 deletions
diff --git a/app/controllers/projects/badges_controller.rb b/app/controllers/projects/badges_controller.rb index dc9c96df003..6ff47c4033a 100644 --- a/app/controllers/projects/badges_controller.rb +++ b/app/controllers/projects/badges_controller.rb @@ -1,5 +1,5 @@ class Projects::BadgesController < Projects::ApplicationController - before_action :set_no_cache + before_action :no_cache_headers def build respond_to do |format| @@ -10,15 +10,4 @@ class Projects::BadgesController < Projects::ApplicationController end end end - - private - - def set_no_cache - expires_now - - # Add some deprecated headers for older agents - # - response.headers['Pragma'] = 'no-cache' - response.headers['Expires'] = 'Fri, 01 Jan 1990 00:00:00 GMT' - end end diff --git a/features/steps/project/badges/build.rb b/features/steps/project/badges/build.rb index 47540f356e9..66a48a176e5 100644 --- a/features/steps/project/badges/build.rb +++ b/features/steps/project/badges/build.rb @@ -21,7 +21,7 @@ class Spinach::Features::ProjectBadgesBuild < Spinach::FeatureSteps end step 'I should see a badge that has not been cached' do - expect(page.response_headers).to include('Cache-Control' => 'no-cache') + expect(page.response_headers['Cache-Control']).to include 'no-cache' end def expect_badge(status) |