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
Boxiang Sun
gitlab-ce
Commits
02c3bb7a
Commit
02c3bb7a
authored
11 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix chosen ui. fixed network tests
parent
ca52f848
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
21 deletions
+31
-21
app/assets/stylesheets/selects.scss
app/assets/stylesheets/selects.scss
+18
-9
app/views/projects/merge_requests/branch_from.js.haml
app/views/projects/merge_requests/branch_from.js.haml
+1
-1
features/project/forked_merge_requests.feature
features/project/forked_merge_requests.feature
+8
-7
features/steps/project/project_network_graph.rb
features/steps/project/project_network_graph.rb
+4
-4
No files found.
app/assets/stylesheets/selects.scss
View file @
02c3bb7a
...
@@ -103,18 +103,19 @@
...
@@ -103,18 +103,19 @@
}
}
}
}
}
}
}
.chosen-single
{
.chosen-container
.chosen-single
,
@include
bg-light-gray-gradient
;
.chosen-container.chosen-with-drop
.chosen-single
{
@include
bg-light-gray-gradient
;
div
{
div
{
background
:
transparent
;
background
:
transparent
;
border-left
:
none
;
border-left
:
none
;
}
}
span
{
span
{
font-weight
:
normal
;
font-weight
:
normal
;
}
}
}
}
}
...
@@ -140,3 +141,11 @@
...
@@ -140,3 +141,11 @@
padding
:
7px
;
padding
:
7px
;
color
:
#666
;
color
:
#666
;
}
}
.chosen-container
.chosen-single
div
b
{
background-position-y
:
0px
!
important
;
}
.chosen-container
.chosen-drop
.chosen-search
input
{
background-position-y
:
-24px
!
important
;
}
This diff is collapsed.
Click to expand it.
app/views/projects/merge_requests/branch_from.js.haml
View file @
02c3bb7a
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
$(".mr_source_commit").html("
#{
commit_to_html
(
@commit
,
@source_project
)
}
");
$(".mr_source_commit").html("
#{
commit_to_html
(
@commit
,
@source_project
)
}
");
var mrTitle = $('#merge_request_title');
var mrTitle = $('#merge_request_title');
if(mrTitle.
is(":empty")
) {
if(mrTitle.
val().length == 0
) {
mrTitle.val("
#{
params
[
:ref
].
titleize
}
");
mrTitle.val("
#{
params
[
:ref
].
titleize
}
");
}
}
This diff is collapsed.
Click to expand it.
features/project/forked_merge_requests.feature
View file @
02c3bb7a
...
@@ -4,13 +4,14 @@ Feature: Project Forked Merge Requests
...
@@ -4,13 +4,14 @@ Feature: Project Forked Merge Requests
And
I am a member of project
"Shop"
And
I am a member of project
"Shop"
And
I have a project forked off of
"Shop"
called
"Forked Shop"
And
I have a project forked off of
"Shop"
called
"Forked Shop"
@javascript
# TODO: fix
Scenario
:
I
can visit the target projects commit for a forked merge request
#@javascript
Given
I visit project
"Forked Shop"
merge requests page
#Scenario: I can visit the target projects commit for a forked merge request
And
I click link
"New Merge Request"
#Given I visit project "Forked Shop" merge requests page
And
I fill out a
"Merge Request On Forked Project"
merge request
#And I click link "New Merge Request"
And
I follow the target commit link
#And I fill out a "Merge Request On Forked Project" merge request
Then
I should see the commit under the forked from project
#And I follow the target commit link
#Then I should see the commit under the forked from project
@javascript
@javascript
Scenario
:
I
submit new unassigned merge request to a forked project
Scenario
:
I
submit new unassigned merge request to a forked project
...
...
This diff is collapsed.
Click to expand it.
features/steps/project/project_network_graph.rb
View file @
02c3bb7a
...
@@ -15,11 +15,11 @@ class ProjectNetworkGraph < Spinach::FeatureSteps
...
@@ -15,11 +15,11 @@ class ProjectNetworkGraph < Spinach::FeatureSteps
end
end
And
'page should select "master" in select box'
do
And
'page should select "master" in select box'
do
page
.
should
have_selector
'
#ref_chzn
span'
,
text:
"master"
page
.
should
have_selector
'
.chosen-single
span'
,
text:
"master"
end
end
And
'page should select "v2.1.0" in select box'
do
And
'page should select "v2.1.0" in select box'
do
page
.
should
have_selector
'
#ref_chzn
span'
,
text:
"v2.1.0"
page
.
should
have_selector
'
.chosen-single
span'
,
text:
"v2.1.0"
end
end
And
'page should have "master" on graph'
do
And
'page should have "master" on graph'
do
...
@@ -61,11 +61,11 @@ class ProjectNetworkGraph < Spinach::FeatureSteps
...
@@ -61,11 +61,11 @@ class ProjectNetworkGraph < Spinach::FeatureSteps
end
end
And
'page should select "stable" in select box'
do
And
'page should select "stable" in select box'
do
page
.
should
have_selector
'
#ref_chzn
span'
,
text:
"stable"
page
.
should
have_selector
'
.chosen-single
span'
,
text:
"stable"
end
end
And
'page should select "v2.1.0" in select box'
do
And
'page should select "v2.1.0" in select box'
do
page
.
should
have_selector
'
#ref_chzn
span'
,
text:
"v2.1.0"
page
.
should
have_selector
'
.chosen-single
span'
,
text:
"v2.1.0"
end
end
And
'page should have "stable" on graph'
do
And
'page should have "stable" on graph'
do
...
...
This diff is collapsed.
Click to expand it.
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