summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-10-24 16:01:08 +0200
committerRobert Speicher <rspeicher@gmail.com>2015-10-24 16:01:08 +0200
commit3c23b6515fcba75b891763d3033d6c7a3eb4d4a6 (patch)
tree694720de298a5c69504ec8fa0e531406cdc45db1
parentab72c12028072e9508ee730e39a68974b2a714f2 (diff)
parent536706fad28b2bb5ea5a981bb81ca67583ab7b5b (diff)
downloadgitlab-ce-3c23b6515fcba75b891763d3033d6c7a3eb4d4a6.tar.gz
Merge remote-tracking branch 'github/master'
-rw-r--r--app/views/projects/ci_settings/_no_runners.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/ci_settings/_no_runners.html.haml b/app/views/projects/ci_settings/_no_runners.html.haml
index 33038c52978..1374e6680f9 100644
--- a/app/views/projects/ci_settings/_no_runners.html.haml
+++ b/app/views/projects/ci_settings/_no_runners.html.haml
@@ -5,4 +5,4 @@
You can add Specific runner for this project on Runners page
- if current_user.admin
- or add Shared runner for whole application in admin are.
+ or add Shared runner for whole application in admin area.