diff options
| author | Phil Hughes <me@iamphill.com> | 2017-11-02 16:07:01 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-11-06 10:52:03 +0000 |
| commit | 4119e92be5a83d845b8076237f7b0957fc392e7a (patch) | |
| tree | 8ad48a29b7ae0fde74987ec722be8610826347d5 /app/controllers | |
| parent | 46e0a66aedac4be34fd5c578af46898a2d208cd2 (diff) | |
| download | gitlab-ce-4119e92be5a83d845b8076237f7b0957fc392e7a.tar.gz | |
correctly updates commit data after committing changes
also merges data in after a fetch to save overriting all data.
changed the render keys to save a full re-render when any data changes
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/refs_controller.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/projects/refs_controller.rb b/app/controllers/projects/refs_controller.rb index e5285ca8fba..ff79f88afc3 100644 --- a/app/controllers/projects/refs_controller.rb +++ b/app/controllers/projects/refs_controller.rb @@ -59,7 +59,8 @@ class Projects::RefsController < Projects::ApplicationController { file_name: content.name, commit: last_commit, - type: content.type + type: content.type, + commit_path: project_commit_path(@project, last_commit) } end end @@ -72,7 +73,7 @@ class Projects::RefsController < Projects::ApplicationController respond_to do |format| format.html { render_404 } format.json do - response.headers["Log-Url"] = @more_log_url + response.headers["More-Logs-Url"] = @more_log_url render json: @logs end |