summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorMayra Cabrera <mcabrera@gitlab.com>2017-11-07 11:02:03 +0100
committerMayra Cabrera <mcabrera@gitlab.com>2017-11-07 11:02:03 +0100
commita438231616bd2fad748cc6d68350c4091c26b89b (patch)
tree000d2a64ed128334eaebc9d0dd977ce7c4c1f13b /app
parent7ebf03319881a853405662a390fff13ffb6aefb0 (diff)
downloadgitlab-ce-a438231616bd2fad748cc6d68350c4091c26b89b.tar.gz
Address discussions on the ME
- Fixes thinner right border on the limit box - Adds and 'elsif' on @branches for the scenario in which a commit is not related to a branch - Fixes small details on limit_exceeded_for_message partial
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/framework/wells.scss2
-rw-r--r--app/views/projects/commit/_limit_exceeded_message.html.haml6
-rw-r--r--app/views/projects/commit/branches.html.haml6
3 files changed, 7 insertions, 7 deletions
diff --git a/app/assets/stylesheets/framework/wells.scss b/app/assets/stylesheets/framework/wells.scss
index 1a5da56cba0..175b2ee7152 100644
--- a/app/assets/stylesheets/framework/wells.scss
+++ b/app/assets/stylesheets/framework/wells.scss
@@ -69,7 +69,7 @@
background: $blue-100;
border-radius: $border-radius-default;
display: inline-block;
- padding: 1px 1px 0.5px;
+ padding: 1px 2px 0.5px;
text-align: center;
vertical-align: bottom;
diff --git a/app/views/projects/commit/_limit_exceeded_message.html.haml b/app/views/projects/commit/_limit_exceeded_message.html.haml
index cdf1a52f5b0..84a52d49487 100644
--- a/app/views/projects/commit/_limit_exceeded_message.html.haml
+++ b/app/views/projects/commit/_limit_exceeded_message.html.haml
@@ -1,8 +1,8 @@
-.has-tooltip{ class: "limit-box limit-box-#{objects.to_s.singularize} prepend-left-5", data: { title: "Project has too many #{label_for_message} to search"} }
+.has-tooltip{ class: "limit-box limit-box-#{objects} prepend-left-5", data: { title: "Project has too many #{label_for_message} to search"} }
.limit-icon
- - if objects == :branches
+ - if objects == :branch
= icon('code-fork')
- else
= icon('tag')
.limit-message
- %span #{objects.capitalize} unavailable
+ %span #{label_for_message.capitalize} unavailable
diff --git a/app/views/projects/commit/branches.html.haml b/app/views/projects/commit/branches.html.haml
index ed6edf6d112..8611129b356 100644
--- a/app/views/projects/commit/branches.html.haml
+++ b/app/views/projects/commit/branches.html.haml
@@ -1,6 +1,6 @@
- if @branches_limit_exceeded
- = render 'limit_exceeded_message', objects: :branches, label_for_message: _('branches')
-- else
+ = render 'limit_exceeded_message', objects: :branch, label_for_message: "branches"
+- elsif @branches.any?
- branch = commit_default_branch(@project, @branches)
= commit_branch_link(project_ref_path(@project, branch), branch)
@@ -10,6 +10,6 @@
%span.js-details-content.hide
= commit_branches_links(@project, @branches)
- if @tags_limit_exceeded
- = render 'limit_exceeded_message', objects: :tags, label_for_message: _('tags')
+ = render 'limit_exceeded_message', objects: :tag, label_for_message: "tags"
- else
= commit_tags_links(@project, @tags)