Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2013-10-21 18:45:09 +0400
committerJacob Vosmaer <contact@jacobvosmaer.nl>2013-10-21 18:45:09 +0400
commit5717304098ae81285a5a616fb066e9ae7ea88f54 (patch)
tree52037dbe534f83a299458773fa8fc83c0e32fa80 /app
parent85be902e0847bc7a6d49f6b2186bd59e6841f959 (diff)
parent873bd3ad2d7e9f1961bd365f1a33b60930cc7233 (diff)
Merge pull request #5359 from dpursehouse/update-some-labels
Minor grammatical updates in some of the labels.
Diffstat (limited to 'app')
-rw-r--r--app/views/admin/groups/edit.html.haml4
-rw-r--r--app/views/admin/groups/new.html.haml2
-rw-r--r--app/views/admin/projects/show.html.haml2
-rw-r--r--app/views/groups/edit.html.haml2
-rw-r--r--app/views/groups/new.html.haml2
-rw-r--r--app/views/projects/edit.html.haml4
-rw-r--r--app/views/projects/new.html.haml4
7 files changed, 10 insertions, 10 deletions
diff --git a/app/views/admin/groups/edit.html.haml b/app/views/admin/groups/edit.html.haml
index 8ed463a8191..3918bf981a2 100644
--- a/app/views/admin/groups/edit.html.haml
+++ b/app/views/admin/groups/edit.html.haml
@@ -6,7 +6,7 @@
%span= @group.errors.full_messages.first
.control-group.group_name_holder
= f.label :name do
- Group name is
+ Group name
.controls
= f.text_field :name, placeholder: "Example Group", class: "input-xxlarge"
@@ -17,7 +17,7 @@
.control-group.group_name_holder
= f.label :path do
- %span.cred Group path is
+ %span.cred Group path
.controls
= f.text_field :path, placeholder: "example-group", class: "input-xxlarge danger"
%ul.cred
diff --git a/app/views/admin/groups/new.html.haml b/app/views/admin/groups/new.html.haml
index 0ae35eb6b43..cfbe6b5ee5a 100644
--- a/app/views/admin/groups/new.html.haml
+++ b/app/views/admin/groups/new.html.haml
@@ -6,7 +6,7 @@
%span= @group.errors.full_messages.first
.control-group
= f.label :name do
- Group name is
+ Group name
.controls
= f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left"
.control-group.group-description-holder
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index c8a87328207..65b9911dc46 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -35,7 +35,7 @@
= @project.creator.try(:name) || '(deleted)'
%li
- %span.light Created at:
+ %span.light Created on:
%strong
= @project.created_at.stamp("March 1, 1999")
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index 2682d31ff47..d6df8d0aedf 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -26,7 +26,7 @@
%span= @group.errors.full_messages.first
.control-group
= f.label :name do
- Group name is
+ Group name
.controls
= f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left"
diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml
index 02049bb2ee6..fc1d89c6285 100644
--- a/app/views/groups/new.html.haml
+++ b/app/views/groups/new.html.haml
@@ -4,7 +4,7 @@
%span= @group.errors.full_messages.first
.control-group
= f.label :name do
- Group name is
+ Group name
.controls
= f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left"
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 03cd3cbd658..d13ae937be5 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -11,7 +11,7 @@
%fieldset
.control-group.project_name_holder
= f.label :name do
- Project name is
+ Project name
.controls
= f.text_field :name, placeholder: "Example Project", class: "span5"
@@ -21,7 +21,7 @@
Project description
%span.light (optional)
.controls
- = f.text_area :description, placeholder: "awesome project", class: "span5", rows: 3, maxlength: 250
+ = f.text_area :description, placeholder: "Awesome project", class: "span5", rows: 3, maxlength: 250
- if @project.repository.exists? && @project.repository.branch_names.any?
.control-group
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index 980b3783a1c..466a63dee83 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -6,7 +6,7 @@
= form_for @project, remote: true do |f|
.control-group.project-name-holder
= f.label :name do
- %strong Project name is
+ %strong Project name
.controls
= f.text_field :name, placeholder: "Example Project", class: "input-xlarge", tabindex: 1, autofocus: true
%span.help-inline
@@ -46,7 +46,7 @@
Description
%span.light (optional)
.controls
- = f.text_area :description, placeholder: "awesome project", class: "input-xlarge", rows: 3, maxlength: 250, tabindex: 3
+ = f.text_area :description, placeholder: "Awesome project", class: "input-xlarge", rows: 3, maxlength: 250, tabindex: 3
.control-group.project-public-holder
= f.label :public do
%span Public project