summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-01-19 13:20:01 -0600
committerMike Greiling <mike@pixelcog.com>2017-01-23 15:48:49 -0600
commitd3baec9abfbc1f1b55a1a369bb0424a9c653de8d (patch)
tree884ce36c34f4e43e21ec5c3e6cf4bca7b4164e0c /app
parent80a0a6a82139d2e972c41e5bfc89dc2fc62d5116 (diff)
downloadgitlab-ce-d3baec9abfbc1f1b55a1a369bb0424a9c653de8d.tar.gz
remove whitespace surrounding inline list controls
Diffstat (limited to 'app')
-rw-r--r--app/views/projects/branches/_branch.html.haml2
-rw-r--r--app/views/projects/buttons/_download.html.haml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml
index 04efc2e996c..19ffe73a08d 100644
--- a/app/views/projects/branches/_branch.html.haml
+++ b/app/views/projects/branches/_branch.html.haml
@@ -18,7 +18,7 @@
- if @project.protected_branch? branch.name
%span.label.label-success
protected
- .controls.hidden-xs
+ .controls.hidden-xs<
- if merge_project && create_mr_button?(@repository.root_ref, branch.name)
= link_to create_mr_path(@repository.root_ref, branch.name), class: 'btn btn-default' do
Merge Request
diff --git a/app/views/projects/buttons/_download.html.haml b/app/views/projects/buttons/_download.html.haml
index 324a7f8cd3f..762ff34a9ec 100644
--- a/app/views/projects/buttons/_download.html.haml
+++ b/app/views/projects/buttons/_download.html.haml
@@ -1,5 +1,5 @@
- if !project.empty_repo? && can?(current_user, :download_code, project)
- .project-action-button.dropdown.inline
+ .project-action-button.dropdown.inline>
%button.btn{ 'data-toggle' => 'dropdown' }
= icon('download')
= icon("caret-down")