diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2017-07-06 12:43:51 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-07-06 12:43:51 -0400 |
| commit | eef068754af7437baf327c5cb4e2b454ba40a617 (patch) | |
| tree | 3583327140b2994432de317b4ac06d66b274b430 /app/controllers/projects/network_controller.rb | |
| parent | 9eeba8fb49c5da7cf0b2c22bc33cbd33a83918ed (diff) | |
| parent | 9274c3c1598f3ff32339e681d5812feeb0f62605 (diff) | |
| download | gitlab-ce-eef068754af7437baf327c5cb4e2b454ba40a617.tar.gz | |
Merge branch 'master' into rs-sign_in
Diffstat (limited to 'app/controllers/projects/network_controller.rb')
| -rw-r--r-- | app/controllers/projects/network_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/network_controller.rb b/app/controllers/projects/network_controller.rb index 33a152ad34f..dfa5e4f7f46 100644 --- a/app/controllers/projects/network_controller.rb +++ b/app/controllers/projects/network_controller.rb @@ -8,8 +8,8 @@ class Projects::NetworkController < Projects::ApplicationController before_action :assign_commit def show - @url = namespace_project_network_path(@project.namespace, @project, @ref, @options.merge(format: :json)) - @commit_url = namespace_project_commit_path(@project.namespace, @project, 'ae45ca32').gsub("ae45ca32", "%s") + @url = project_network_path(@project, @ref, @options.merge(format: :json)) + @commit_url = project_commit_path(@project, 'ae45ca32').gsub("ae45ca32", "%s") respond_to do |format| format.html do |