Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

This commit is contained in:
Yorick Peterse
2016-04-04 22:56:19 +02:00
5 changed files with 11 additions and 9 deletions
+1 -1
View File
@@ -15,7 +15,7 @@
%td
- if project
= link_to project.name_with_namespace, admin_namespace_project_path(project.namespace, project), class: "monospace"
= link_to project.name_with_namespace, admin_namespace_project_path(project.namespace, project)
%td
= link_to build.short_sha, namespace_project_commit_path(build.project.namespace, build.project, build.sha), class: "monospace"
+1 -1
View File
@@ -1,4 +1,4 @@
.admin-dashboard
.admin-dashboard.prepend-top-default
.row
.col-md-4
%h4 Statistics
+1 -1
View File
@@ -1,5 +1,5 @@
- page_title "Deploy Keys"
.panel.panel-default
.panel.panel-default.prepend-top-default
.panel-heading
Public deploy keys (#{@deploy_keys.count})
.controls
+7 -5
View File
@@ -1,8 +1,10 @@
- page_title "Labels"
= link_to new_admin_label_path, class: "pull-right btn btn-nr btn-new" do
New label
%h3.page-title
Labels
%div
= link_to new_admin_label_path, class: "pull-right btn btn-nr btn-new" do
New label
%h3.page-title
Labels
%hr
.labels
@@ -13,4 +15,4 @@
- else
.light-well
.nothing-here-block There are no labels yet
+1 -1
View File
@@ -1,4 +1,4 @@
%p.lead
%p.lead.prepend-top-default
%span
To register a new runner you should enter the following registration token.
With this token the runner will request a unique runner token and use that for future communication.