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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
3e9460b6
Commit
3e9460b6
authored
Aug 01, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix minor wording
parent
ce5fca48
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
app/views/groups/edit.html.haml
app/views/groups/edit.html.haml
+3
-3
app/views/projects/merge_requests/show/_how_to_merge.html.haml
...iews/projects/merge_requests/show/_how_to_merge.html.haml
+1
-1
No files found.
app/views/groups/edit.html.haml
View file @
3e9460b6
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
.ui-box
.ui-box
.title
.title
%strong
=
@group
.
name
%strong
=
@group
.
name
Group S
ettings:
group s
ettings:
%div
.form-holder
%div
.form-holder
=
form_for
@group
do
|
f
|
=
form_for
@group
do
|
f
|
-
if
@group
.
errors
.
any?
-
if
@group
.
errors
.
any?
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
.ui-box
.ui-box
.title
.title
%strong
=
@group
.
name
%strong
=
@group
.
name
P
rojects:
p
rojects:
-
if
can?
current_user
,
:manage_group
,
@group
-
if
can?
current_user
,
:manage_group
,
@group
%span
.pull-right
%span
.pull-right
=
link_to
new_project_path
(
namespace_id:
@group
.
id
),
class:
"btn btn-tiny"
do
=
link_to
new_project_path
(
namespace_id:
@group
.
id
),
class:
"btn btn-tiny"
do
...
@@ -85,4 +85,4 @@
...
@@ -85,4 +85,4 @@
%p
%p
%strong
Removed group can not be restored!
%strong
Removed group can not be restored!
=
link_to
'Remove Group'
,
@group
,
confirm:
'Removed group can not be restored! Are you sure?'
,
method: :delete
,
class:
"btn btn-remove
btn-small
"
=
link_to
'Remove Group'
,
@group
,
confirm:
'Removed group can not be restored! Are you sure?'
,
method: :delete
,
class:
"btn btn-remove"
app/views/projects/merge_requests/show/_how_to_merge.html.haml
View file @
3e9460b6
%div
#modal_merge_info
.modal.hide
%div
#modal_merge_info
.modal.hide
.modal-header
.modal-header
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%h3
How
To M
erge
%h3
How
to m
erge
.modal-body
.modal-body
%p
%p
%strong
Step 1.
%strong
Step 1.
...
...
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