Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2018-04-26 17:18:59 +0300
committerNick Thomas <nick@gitlab.com>2018-04-26 17:18:59 +0300
commitc2834665038c0932e041268a845b86f7c4e55162 (patch)
tree7ab92bedef71fef156ae89c243b4ba2a25aa00f9 /app/helpers
parentf5524d554bce7028f410f51b5fef85641a5f0216 (diff)
parent8b321679db776840da70a6a7c0cdd571b59d4978 (diff)
Merge branch 'ide-relative-url-fix' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/blob_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb
index fef29789832..e7a36e20050 100644
--- a/app/helpers/blob_helper.rb
+++ b/app/helpers/blob_helper.rb
@@ -17,7 +17,7 @@ module BlobHelper
end
def ide_edit_path(project = @project, ref = @ref, path = @path, options = {})
- "#{ide_path}/project#{edit_blob_path(project, ref, path, options)}"
+ "#{ide_path}/project#{url_for([project, "edit", "blob", id: [ref, path], script_name: "/"])}"
end
def edit_blob_button(project = @project, ref = @ref, path = @path, options = {})