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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
68eb3948
Commit
68eb3948
authored
Jan 06, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Green button when we create new item, blue when save or some primary action
parent
baf591cc
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
6 deletions
+9
-6
app/views/issues/_form.html.haml
app/views/issues/_form.html.haml
+1
-1
app/views/merge_requests/_form.html.haml
app/views/merge_requests/_form.html.haml
+6
-3
app/views/projects/_new_form.html.haml
app/views/projects/_new_form.html.haml
+1
-1
features/steps/project/project_merge_requests.rb
features/steps/project/project_merge_requests.rb
+1
-1
No files found.
app/views/issues/_form.html.haml
View file @
68eb3948
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
.actions
.actions
-
if
@issue
.
new_record?
-
if
@issue
.
new_record?
=
f
.
submit
'Submit new issue'
,
class:
"btn s
ave-btn
"
=
f
.
submit
'Submit new issue'
,
class:
"btn s
uccess
"
-
else
-
else
=
f
.
submit
'Save changes'
,
class:
"save-btn btn"
=
f
.
submit
'Save changes'
,
class:
"save-btn btn"
...
...
app/views/merge_requests/_form.html.haml
View file @
68eb3948
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
.row
.row
.span5
.span5
.mr_branch_box
.mr_branch_box
%h5
From (Head Branch)
%h5
.cgray
From (Head Branch)
.body
.body
.padded
=
f
.
select
(
:source_branch
,
@repository
.
heads
.
map
(
&
:name
),
{
include_blank:
"Select branch"
},
{
class:
'chosen span4'
})
.padded
=
f
.
select
(
:source_branch
,
@repository
.
heads
.
map
(
&
:name
),
{
include_blank:
"Select branch"
},
{
class:
'chosen span4'
})
.mr_source_commit
.mr_source_commit
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
%center
=
image_tag
"merge.png"
,
class:
'mr_direction_tip'
%center
=
image_tag
"merge.png"
,
class:
'mr_direction_tip'
.span5
.span5
.mr_branch_box
.mr_branch_box
%h5
To (Base Branch)
%h5
.cgray
To (Base Branch)
.body
.body
.padded
=
f
.
select
(
:target_branch
,
@repository
.
heads
.
map
(
&
:name
),
{
include_blank:
"Select branch"
},
{
class:
'chosen span4'
})
.padded
=
f
.
select
(
:target_branch
,
@repository
.
heads
.
map
(
&
:name
),
{
include_blank:
"Select branch"
},
{
class:
'chosen span4'
})
.mr_target_commit
.mr_target_commit
...
@@ -50,7 +50,10 @@
...
@@ -50,7 +50,10 @@
.control-group
.control-group
.form-actions
.form-actions
=
f
.
submit
'Save'
,
class:
"btn save-btn"
-
if
@merge_request
.
new_record?
=
f
.
submit
'Submit merge request'
,
class:
"btn success"
-
else
=
f
.
submit
'Save changes'
,
class:
"save-btn btn"
-
if
@merge_request
.
new_record?
-
if
@merge_request
.
new_record?
=
link_to
project_merge_requests_path
(
@project
),
class:
"btn cancel-btn"
do
=
link_to
project_merge_requests_path
(
@project
),
class:
"btn cancel-btn"
do
Cancel
Cancel
...
...
app/views/projects/_new_form.html.haml
View file @
68eb3948
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
Project name is
Project name is
.input
.input
=
f
.
text_field
:name
,
placeholder:
"Example Project"
,
class:
"xxlarge"
=
f
.
text_field
:name
,
placeholder:
"Example Project"
,
class:
"xxlarge"
=
f
.
submit
'Create project'
,
class:
"btn
primary
project-submit"
=
f
.
submit
'Create project'
,
class:
"btn
success
project-submit"
-
if
current_user
.
several_namespaces?
-
if
current_user
.
several_namespaces?
.clearfix
.clearfix
...
...
features/steps/project/project_merge_requests.rb
View file @
68eb3948
...
@@ -54,7 +54,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps
...
@@ -54,7 +54,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps
fill_in
"merge_request_title"
,
:with
=>
"Wiki Feature"
fill_in
"merge_request_title"
,
:with
=>
"Wiki Feature"
select
"master"
,
:from
=>
"merge_request_source_branch"
select
"master"
,
:from
=>
"merge_request_source_branch"
select
"stable"
,
:from
=>
"merge_request_target_branch"
select
"stable"
,
:from
=>
"merge_request_target_branch"
click_button
"S
ave
"
click_button
"S
ubmit merge request
"
end
end
Then
'I should see merge request "Wiki Feature"'
do
Then
'I should see merge request "Wiki Feature"'
do
...
...
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