summaryrefslogtreecommitdiff
path: root/app/views/projects
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2018-02-22 13:54:19 +0100
committerJames Lopez <james@jameslopez.es>2018-02-23 14:02:40 +0100
commit0767861bcdc62cedf374c6a4b53d8526efb4ff58 (patch)
tree3e6d866497ba45ac0cafcbf3963cf7f6979b4dfd /app/views/projects
parent228b757d29a141c4fda0e7c4be75784a6cefe427 (diff)
downloadgitlab-ce-0767861bcdc62cedf374c6a4b53d8526efb4ff58.tar.gz
refactor code based on feedback
Diffstat (limited to 'app/views/projects')
-rw-r--r--app/views/projects/blob/_header.html.haml4
-rw-r--r--app/views/projects/diffs/_file.html.haml2
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/blob/_header.html.haml b/app/views/projects/blob/_header.html.haml
index da0c0ed6cb4..1b150ec3e5c 100644
--- a/app/views/projects/blob/_header.html.haml
+++ b/app/views/projects/blob/_header.html.haml
@@ -11,8 +11,8 @@
= view_on_environment_button(@commit.sha, @path, @environment) if @environment
.btn-group{ role: "group" }<
- = edit_blob_element
- = ide_edit_element
+ = edit_blob_button
+ = ide_edit_button
- if current_user
= replace_blob_link
= delete_blob_link
diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml
index 3e6001e6f30..47bfcb21cf4 100644
--- a/app/views/projects/diffs/_file.html.haml
+++ b/app/views/projects/diffs/_file.html.haml
@@ -17,7 +17,7 @@
\
- if editable_diff?(diff_file)
- link_opts = @merge_request.persisted? ? { from_merge_request_iid: @merge_request.iid } : {}
- = edit_blob_element(@merge_request.source_project, @merge_request.source_branch, diff_file.new_path,
+ = edit_blob_button(@merge_request.source_project, @merge_request.source_branch, diff_file.new_path,
blob: blob, link_opts: link_opts)
- if image_diff && image_replaced