summaryrefslogtreecommitdiff
path: root/app/helpers/button_helper.rb
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-06-08 09:29:57 +0100
committerFilipa Lacerda <filipa@gitlab.com>2017-06-08 09:29:57 +0100
commit3004a05c884279fd0cd4982282947d55bfbb2ce0 (patch)
tree7a41c5ce3456ea1070c74b0702583a7675220a3b /app/helpers/button_helper.rb
parent718d919012ec3aa4cedb127a253cce8de4a8e918 (diff)
parentacdd1bf7c92b7e9cdbd579df8faca5ea7783489f (diff)
downloadgitlab-ce-33210-stop-auto-scroll.tar.gz
Merge branch 'master' into 33210-stop-auto-scroll33210-stop-auto-scroll
* master: (92 commits) Responsive table fixes remove the rouge copypasta and add notes to refactor nil-check Repository::is_ancestor? update rouge to 2.1.0 Added more negative checks for public project Fix End Syntax Error Enhancing Spec's with negative cases Improve form spec Update CHANGELOG.md for 9.0.10 Update CHANGELOG.md for 9.2.5 Fixed spec test syntax errors Update CHANGELOG.md for 9.1.7 Translate project & repository pages Converting Tests to Spec Tests Added more actions and report as abuse to all notes Add sticky confidential issue bar Fix for Login Test Problem Document not using STI Added Cop to blacklist polymorphic associations Document not using polymorphic associations ...
Diffstat (limited to 'app/helpers/button_helper.rb')
-rw-r--r--app/helpers/button_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/button_helper.rb b/app/helpers/button_helper.rb
index 0081bbd92b3..00464810054 100644
--- a/app/helpers/button_helper.rb
+++ b/app/helpers/button_helper.rb
@@ -61,7 +61,7 @@ module ButtonHelper
html: true,
placement: placement,
container: 'body',
- title: "Set a password on your account<br>to pull or push via #{protocol}"
+ title: _("Set a password on your account to pull or push via %{protocol}") % { protocol: protocol }
}
end
@@ -76,7 +76,7 @@ module ButtonHelper
html: true,
placement: placement,
container: 'body',
- title: 'Add an SSH key to your profile<br>to pull or push via SSH.'
+ title: _('Add an SSH key to your profile to pull or push via SSH.')
}
end
end