diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-16 10:03:52 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-16 10:03:52 -0800 |
| commit | ca29617d54009168086ae567ced6b80bab2df03f (patch) | |
| tree | 38b8e040681fe366b64b598282f8fce3d2a5cd20 /app/controllers | |
| parent | 99490159e5f9d6ff4b45f78b977d01caa1e3c4fc (diff) | |
| parent | 63723ef6df788391ed776441421ae482ad4fbd82 (diff) | |
| download | gitlab-ce-ca29617d54009168086ae567ced6b80bab2df03f.tar.gz | |
Merge pull request #5843 from bke-drewb/fix/dashboard_event_updates
Fix dashboard event caching
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/issues_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/projects/notes_controller.rb | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 5dcdba5d388..e7b4c837ae3 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -74,6 +74,7 @@ class Projects::IssuesController < Projects::ApplicationController def update @issue.update_attributes(params[:issue].merge(author_id_of_changes: current_user.id)) + @issue.reset_events_cache respond_to do |format| format.js diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 7d7c1104ec9..6d39673194a 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -97,6 +97,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController if @merge_request.update_attributes(params[:merge_request].merge(author_id_of_changes: current_user.id)) @merge_request.reload_code @merge_request.mark_as_unchecked + @merge_request.reset_events_cache redirect_to [@merge_request.target_project, @merge_request], notice: 'Merge request was successfully updated.' else render "edit" diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index 2738a99459d..5ff5c5b7d96 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -39,6 +39,7 @@ class Projects::NotesController < Projects::ApplicationController @note = @project.notes.find(params[:id]) return access_denied! unless can?(current_user, :admin_note, @note) @note.destroy + @note.reset_events_cache respond_to do |format| format.js { render nothing: true } @@ -50,6 +51,7 @@ class Projects::NotesController < Projects::ApplicationController return access_denied! unless can?(current_user, :admin_note, @note) @note.update_attributes(params[:note]) + @note.reset_events_cache respond_to do |format| format.js do |