Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
ed74fa73
Commit
ed74fa73
authored
Dec 02, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use consistent casing for page titles
parent
09e712c0
Changes
29
Hide whitespace changes
Inline
Side-by-side
Showing
29 changed files
with
62 additions
and
58 deletions
+62
-58
app/views/admin/labels/edit.html.haml
app/views/admin/labels/edit.html.haml
+2
-6
app/views/admin/labels/new.html.haml
app/views/admin/labels/new.html.haml
+2
-4
app/views/admin/users/edit.html.haml
app/views/admin/users/edit.html.haml
+0
-3
app/views/groups/edit.html.haml
app/views/groups/edit.html.haml
+1
-2
app/views/groups/new.html.haml
app/views/groups/new.html.haml
+6
-1
app/views/projects/blob/new.html.haml
app/views/projects/blob/new.html.haml
+2
-3
app/views/projects/branches/new.html.haml
app/views/projects/branches/new.html.haml
+3
-2
app/views/projects/deploy_keys/new.html.haml
app/views/projects/deploy_keys/new.html.haml
+1
-1
app/views/projects/issues/_form.html.haml
app/views/projects/issues/_form.html.haml
+0
-3
app/views/projects/issues/edit.html.haml
app/views/projects/issues/edit.html.haml
+6
-0
app/views/projects/issues/new.html.haml
app/views/projects/issues/new.html.haml
+4
-0
app/views/projects/labels/edit.html.haml
app/views/projects/labels/edit.html.haml
+2
-6
app/views/projects/labels/new.html.haml
app/views/projects/labels/new.html.haml
+2
-4
app/views/projects/merge_requests/_new_compare.html.haml
app/views/projects/merge_requests/_new_compare.html.haml
+2
-1
app/views/projects/merge_requests/_new_submit.html.haml
app/views/projects/merge_requests/_new_submit.html.haml
+1
-1
app/views/projects/merge_requests/edit.html.haml
app/views/projects/merge_requests/edit.html.haml
+1
-1
app/views/projects/milestones/_form.html.haml
app/views/projects/milestones/_form.html.haml
+0
-7
app/views/projects/milestones/edit.html.haml
app/views/projects/milestones/edit.html.haml
+6
-0
app/views/projects/milestones/new.html.haml
app/views/projects/milestones/new.html.haml
+6
-0
app/views/projects/new.html.haml
app/views/projects/new.html.haml
+6
-1
app/views/projects/services/_form.html.haml
app/views/projects/services/_form.html.haml
+0
-4
app/views/projects/snippets/edit.html.haml
app/views/projects/snippets/edit.html.haml
+1
-1
app/views/projects/snippets/new.html.haml
app/views/projects/snippets/new.html.haml
+1
-1
app/views/projects/tags/new.html.haml
app/views/projects/tags/new.html.haml
+1
-1
app/views/shared/_confirm_modal.html.haml
app/views/shared/_confirm_modal.html.haml
+2
-1
app/views/snippets/edit.html.haml
app/views/snippets/edit.html.haml
+1
-1
app/views/snippets/new.html.haml
app/views/snippets/new.html.haml
+1
-1
features/steps/project/forked_merge_requests.rb
features/steps/project/forked_merge_requests.rb
+1
-1
features/steps/project/source/browse_files.rb
features/steps/project/source/browse_files.rb
+1
-1
No files found.
app/views/admin/labels/edit.html.haml
View file @
ed74fa73
-
page_title
"Edit"
,
@label
.
name
,
"Labels"
-
page_title
"Edit"
,
@label
.
name
,
"Labels"
%h3
%h3
.page-title
Edit label
Edit Label
%span
.light
#{
@label
.
name
}
.back-link
=
link_to
admin_labels_path
do
←
To labels list
%hr
%hr
=
render
'form'
=
render
'form'
app/views/admin/labels/new.html.haml
View file @
ed74fa73
-
page_title
"New Label"
-
page_title
"New Label"
%h3
New label
%h3
.page-title
.back-link
New Label
=
link_to
admin_labels_path
do
←
To labels list
%hr
%hr
=
render
'form'
=
render
'form'
app/views/admin/users/edit.html.haml
View file @
ed74fa73
-
page_title
"Edit"
,
@user
.
name
,
"Users"
-
page_title
"Edit"
,
@user
.
name
,
"Users"
%h3
.page-title
%h3
.page-title
Edit user:
#{
@user
.
name
}
Edit user:
#{
@user
.
name
}
.back-link
=
link_to
admin_user_path
(
@user
)
do
←
Back to user page
%hr
%hr
=
render
'form'
=
render
'form'
app/views/groups/edit.html.haml
View file @
ed74fa73
...
@@ -3,8 +3,7 @@
...
@@ -3,8 +3,7 @@
.panel.panel-default
.panel.panel-default
.panel-heading
.panel-heading
%strong
=
@group
.
name
Group settings
group settings:
.panel-body
.panel-body
=
form_for
@group
,
html:
{
multipart:
true
,
class:
"form-horizontal"
},
authenticity_token:
true
do
|
f
|
=
form_for
@group
,
html:
{
multipart:
true
,
class:
"form-horizontal"
},
authenticity_token:
true
do
|
f
|
-
if
@group
.
errors
.
any?
-
if
@group
.
errors
.
any?
...
...
app/views/groups/new.html.haml
View file @
ed74fa73
-
page_title
'New Group'
-
page_title
'New Group'
-
header_title
'New Group'
-
header_title
"Groups"
,
dashboard_groups_path
%h3
.page-title
New Group
%hr
=
form_for
@group
,
html:
{
class:
'group-form form-horizontal'
}
do
|
f
|
=
form_for
@group
,
html:
{
class:
'group-form form-horizontal'
}
do
|
f
|
-
if
@group
.
errors
.
any?
-
if
@group
.
errors
.
any?
.alert.alert-danger
.alert.alert-danger
...
...
app/views/projects/blob/new.html.haml
View file @
ed74fa73
-
page_title
"New File"
,
@path
.
presence
,
@ref
-
page_title
"New File"
,
@path
.
presence
,
@ref
=
render
"header_title"
=
render
"header_title"
.gray-content-block.top-block
%h3
.page-title
%h3
.page-title
New File
Create New File
.file-editor
.file-editor
=
form_tag
(
namespace_project_create_blob_path
(
@project
.
namespace
,
@project
,
@id
),
method: :post
,
class:
'form-horizontal js-new-blob-form js-requires-input'
)
do
=
form_tag
(
namespace_project_create_blob_path
(
@project
.
namespace
,
@project
,
@id
),
method: :post
,
class:
'form-horizontal js-new-blob-form js-requires-input'
)
do
...
...
app/views/projects/branches/new.html.haml
View file @
ed74fa73
...
@@ -6,8 +6,9 @@
...
@@ -6,8 +6,9 @@
%button
{
type:
"button"
,
class:
"close"
,
"data-dismiss"
=>
"alert"
}
×
%button
{
type:
"button"
,
class:
"close"
,
"data-dismiss"
=>
"alert"
}
×
=
@error
=
@error
%h3
.page-title
%h3
.page-title
%i
.fa.fa-code-fork
New Branch
New branch
%hr
=
form_tag
namespace_project_branches_path
,
method: :post
,
id:
"new-branch-form"
,
class:
"form-horizontal js-requires-input"
do
=
form_tag
namespace_project_branches_path
,
method: :post
,
id:
"new-branch-form"
,
class:
"form-horizontal js-requires-input"
do
.form-group
.form-group
=
label_tag
:branch_name
,
'Name for new branch'
,
class:
'control-label'
=
label_tag
:branch_name
,
'Name for new branch'
,
class:
'control-label'
...
...
app/views/projects/deploy_keys/new.html.haml
View file @
ed74fa73
-
page_title
"New Deploy Key"
-
page_title
"New Deploy Key"
%h3
.page-title
New Deploy
k
ey
%h3
.page-title
New Deploy
K
ey
%hr
%hr
=
render
'form'
=
render
'form'
app/views/projects/issues/_form.html.haml
View file @
ed74fa73
%div
.issue-form-holder
%div
.issue-form-holder
%h3
.page-title
=
@issue
.
new_record?
?
"Create Issue"
:
"Edit Issue #
#{
@issue
.
iid
}
"
%hr
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@issue
],
html:
{
class:
'form-horizontal issue-form gfm-form'
}
do
|
f
|
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@issue
],
html:
{
class:
'form-horizontal issue-form gfm-form'
}
do
|
f
|
=
render
'shared/issuable/form'
,
f:
f
,
issuable:
@issue
=
render
'shared/issuable/form'
,
f:
f
,
issuable:
@issue
...
...
app/views/projects/issues/edit.html.haml
View file @
ed74fa73
-
page_title
"Edit"
,
"
#{
@issue
.
title
}
(#
#{
@issue
.
iid
}
)"
,
"Issues"
-
page_title
"Edit"
,
"
#{
@issue
.
title
}
(#
#{
@issue
.
iid
}
)"
,
"Issues"
=
render
"header_title"
%h3
.page-title
Edit Issue ##{@issue.iid}
%hr
=
render
"form"
=
render
"form"
app/views/projects/issues/new.html.haml
View file @
ed74fa73
-
page_title
"New Issue"
-
page_title
"New Issue"
=
render
"header_title"
=
render
"header_title"
%h3
.page-title
New Issue
%hr
=
render
"form"
=
render
"form"
app/views/projects/labels/edit.html.haml
View file @
ed74fa73
-
page_title
"Edit"
,
@label
.
name
,
"Labels"
-
page_title
"Edit"
,
@label
.
name
,
"Labels"
=
render
"header_title"
=
render
"header_title"
%h3
%h3
.page-title
Edit label
Edit Label
%span
.light
#{
@label
.
name
}
.back-link
=
link_to
namespace_project_labels_path
(
@project
.
namespace
,
@project
)
do
←
To labels list
%hr
%hr
=
render
'form'
=
render
'form'
app/views/projects/labels/new.html.haml
View file @
ed74fa73
-
page_title
"New Label"
-
page_title
"New Label"
=
render
"header_title"
=
render
"header_title"
%h3
New label
%h3
.page-title
.back-link
New Label
=
link_to
namespace_project_labels_path
(
@project
.
namespace
,
@project
)
do
←
To labels list
%hr
%hr
=
render
'form'
=
render
'form'
app/views/projects/merge_requests/_new_compare.html.haml
View file @
ed74fa73
%p
.lead
Compare branches for new Merge Request
%h3
.page-title
New Merge Request
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@merge_request
],
url:
new_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
),
method: :get
,
html:
{
class:
"merge-request-form form-inline js-requires-input"
}
do
|
f
|
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@merge_request
],
url:
new_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
),
method: :get
,
html:
{
class:
"merge-request-form form-inline js-requires-input"
}
do
|
f
|
.hide.alert.alert-danger.mr-compare-errors
.hide.alert.alert-danger.mr-compare-errors
...
...
app/views/projects/merge_requests/_new_submit.html.haml
View file @
ed74fa73
%h3
.page-title
%h3
.page-title
New
merge r
equest
New
Merge R
equest
%p
.slead
%p
.slead
-
source_title
,
target_title
=
format_mr_branch_names
(
@merge_request
)
-
source_title
,
target_title
=
format_mr_branch_names
(
@merge_request
)
From
From
...
...
app/views/projects/merge_requests/edit.html.haml
View file @
ed74fa73
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
=
render
"header_title"
=
render
"header_title"
%h3
.page-title
%h3
.page-title
=
"Edit merge request #
#{
@merge_request
.
iid
}
"
Edit Merge Request ##{@merge_request.iid}
%hr
%hr
=
render
'form'
=
render
'form'
app/views/projects/milestones/_form.html.haml
View file @
ed74fa73
%h3
.page-title
=
@milestone
.
new_record?
?
"New Milestone"
:
"Edit Milestone #
#{
@milestone
.
iid
}
"
.back-link
=
link_to
namespace_project_milestones_path
(
@project
.
namespace
,
@project
)
do
←
To milestones
%hr
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@milestone
],
html:
{
class:
'form-horizontal milestone-form gfm-form js-requires-input'
}
do
|
f
|
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@milestone
],
html:
{
class:
'form-horizontal milestone-form gfm-form js-requires-input'
}
do
|
f
|
-
if
@milestone
.
errors
.
any?
-
if
@milestone
.
errors
.
any?
.alert.alert-danger
.alert.alert-danger
...
...
app/views/projects/milestones/edit.html.haml
View file @
ed74fa73
-
page_title
"Edit"
,
@milestone
.
title
,
"Milestones"
-
page_title
"Edit"
,
@milestone
.
title
,
"Milestones"
=
render
"header_title"
=
render
"header_title"
%h3
.page-title
Edit Milestone ##{@milestone.iid}
%hr
=
render
"form"
=
render
"form"
app/views/projects/milestones/new.html.haml
View file @
ed74fa73
-
page_title
"New Milestone"
-
page_title
"New Milestone"
=
render
"header_title"
=
render
"header_title"
%h3
.page-title
New Milestone
%hr
=
render
"form"
=
render
"form"
app/views/projects/new.html.haml
View file @
ed74fa73
-
page_title
'New Project'
-
page_title
'New Project'
-
header_title
'New Project'
-
header_title
"Projects"
,
root_path
%h3
.page-title
New Project
%hr
.project-edit-container
.project-edit-container
.project-edit-errors
.project-edit-errors
=
render
'projects/errors'
=
render
'projects/errors'
...
...
app/views/projects/services/_form.html.haml
View file @
ed74fa73
...
@@ -4,10 +4,6 @@
...
@@ -4,10 +4,6 @@
%p
=
@service
.
description
%p
=
@service
.
description
.back-link
=
link_to
namespace_project_services_path
(
@project
.
namespace
,
@project
)
do
←
to services
%hr
%hr
=
form_for
(
@service
,
as: :service
,
url:
namespace_project_service_path
(
@project
.
namespace
,
@project
,
@service
.
to_param
),
method: :put
,
html:
{
class:
'form-horizontal'
})
do
|
form
|
=
form_for
(
@service
,
as: :service
,
url:
namespace_project_service_path
(
@project
.
namespace
,
@project
,
@service
.
to_param
),
method: :put
,
html:
{
class:
'form-horizontal'
})
do
|
form
|
...
...
app/views/projects/snippets/edit.html.haml
View file @
ed74fa73
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
=
render
"header_title"
=
render
"header_title"
%h3
.page-title
%h3
.page-title
Edit
s
nippet
Edit
S
nippet
%hr
%hr
=
render
"shared/snippets/form"
,
url:
namespace_project_snippet_path
(
@project
.
namespace
,
@project
,
@snippet
),
visibility_level:
@snippet
.
visibility_level
=
render
"shared/snippets/form"
,
url:
namespace_project_snippet_path
(
@project
.
namespace
,
@project
,
@snippet
),
visibility_level:
@snippet
.
visibility_level
app/views/projects/snippets/new.html.haml
View file @
ed74fa73
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
=
render
"header_title"
=
render
"header_title"
%h3
.page-title
%h3
.page-title
New
s
nippet
New
S
nippet
%hr
%hr
=
render
"shared/snippets/form"
,
url:
namespace_project_snippets_path
(
@project
.
namespace
,
@project
,
@snippet
),
visibility_level:
default_snippet_visibility
=
render
"shared/snippets/form"
,
url:
namespace_project_snippets_path
(
@project
.
namespace
,
@project
,
@snippet
),
visibility_level:
default_snippet_visibility
app/views/projects/tags/new.html.haml
View file @
ed74fa73
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
=
@error
=
@error
%h3
.page-title
%h3
.page-title
New
git t
ag
New
T
ag
%hr
%hr
=
form_tag
namespace_project_tags_path
,
method: :post
,
id:
"new-tag-form"
,
class:
"form-horizontal gfm-form tag-form"
do
=
form_tag
namespace_project_tags_path
,
method: :post
,
id:
"new-tag-form"
,
class:
"form-horizontal gfm-form tag-form"
do
...
...
app/views/shared/_confirm_modal.html.haml
View file @
ed74fa73
...
@@ -3,7 +3,8 @@
...
@@ -3,7 +3,8 @@
.modal-content
.modal-content
.modal-header
.modal-header
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%h4
Confirmation required
%h3
.page-title
Confirmation required
.modal-body
.modal-body
%p
.cred.lead.js-confirm-text
%p
.cred.lead.js-confirm-text
...
...
app/views/snippets/edit.html.haml
View file @
ed74fa73
-
page_title
"Edit"
,
@snippet
.
title
,
"Snippets"
-
page_title
"Edit"
,
@snippet
.
title
,
"Snippets"
%h3
.page-title
%h3
.page-title
Edit
s
nippet
Edit
S
nippet
%hr
%hr
=
render
'shared/snippets/form'
,
url:
snippet_path
(
@snippet
),
visibility_level:
@snippet
.
visibility_level
=
render
'shared/snippets/form'
,
url:
snippet_path
(
@snippet
),
visibility_level:
@snippet
.
visibility_level
app/views/snippets/new.html.haml
View file @
ed74fa73
-
page_title
"New Snippet"
-
page_title
"New Snippet"
%h3
.page-title
%h3
.page-title
New
s
nippet
New
S
nippet
%hr
%hr
=
render
"shared/snippets/form"
,
url:
snippets_path
(
@snippet
),
visibility_level:
default_snippet_visibility
=
render
"shared/snippets/form"
,
url:
snippets_path
(
@snippet
),
visibility_level:
default_snippet_visibility
features/steps/project/forked_merge_requests.rb
View file @
ed74fa73
...
@@ -41,7 +41,7 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
...
@@ -41,7 +41,7 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
click_button
"Compare branches"
click_button
"Compare branches"
expect
(
page
).
to
have_content
"New
merge r
equest"
expect
(
page
).
to
have_content
"New
Merge R
equest"
fill_in
"merge_request_title"
,
with:
"Merge Request On Forked Project"
fill_in
"merge_request_title"
,
with:
"Merge Request On Forked Project"
end
end
...
...
features/steps/project/source/browse_files.rb
View file @
ed74fa73
...
@@ -142,7 +142,7 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
...
@@ -142,7 +142,7 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
end
end
step
'I can see new file page'
do
step
'I can see new file page'
do
expect
(
page
).
to
have_content
"
Create
New File"
expect
(
page
).
to
have_content
"New File"
expect
(
page
).
to
have_content
"Commit message"
expect
(
page
).
to
have_content
"Commit message"
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment