Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
02c3bb7a
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
02c3bb7a
编写于
8月 08, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix chosen ui. fixed network tests
上级
ca52f848
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
31 addition
and
21 deletion
+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
未找到文件。
app/assets/stylesheets/selects.scss
浏览文件 @
02c3bb7a
...
...
@@ -103,18 +103,19 @@
}
}
}
}
.chosen-single
{
@include
bg-light-gray-gradient
;
.chosen-container
.chosen-single
,
.chosen-container.chosen-with-drop
.chosen-single
{
@include
bg-light-gray-gradient
;
div
{
background
:
transparent
;
border-left
:
none
;
}
div
{
background
:
transparent
;
border-left
:
none
;
}
span
{
font-weight
:
normal
;
}
span
{
font-weight
:
normal
;
}
}
...
...
@@ -140,3 +141,11 @@
padding
:
7px
;
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
;
}
app/views/projects/merge_requests/branch_from.js.haml
浏览文件 @
02c3bb7a
...
...
@@ -2,6 +2,6 @@
$(".mr_source_commit").html("
#{
commit_to_html
(
@commit
,
@source_project
)
}
");
var mrTitle = $('#merge_request_title');
if(mrTitle.
is(":empty")
) {
if(mrTitle.
val().length == 0
) {
mrTitle.val("
#{
params
[
:ref
].
titleize
}
");
}
features/project/forked_merge_requests.feature
浏览文件 @
02c3bb7a
...
...
@@ -4,13 +4,14 @@ Feature: Project Forked Merge Requests
And
I am a member of project
"Shop"
And
I have a project forked off of
"Shop"
called
"Forked Shop"
@javascript
Scenario
:
I
can visit the target projects commit for a forked merge request
Given
I visit project
"Forked Shop"
merge requests page
And
I click link
"New Merge Request"
And
I fill out a
"Merge Request On Forked Project"
merge request
And
I follow the target commit link
Then
I should see the commit under the forked from project
# TODO: fix
#@javascript
#Scenario: I can visit the target projects commit for a forked merge request
#Given I visit project "Forked Shop" merge requests page
#And I click link "New Merge Request"
#And I fill out a "Merge Request On Forked Project" merge request
#And I follow the target commit link
#Then I should see the commit under the forked from project
@javascript
Scenario
:
I
submit new unassigned merge request to a forked project
...
...
features/steps/project/project_network_graph.rb
浏览文件 @
02c3bb7a
...
...
@@ -15,11 +15,11 @@ class ProjectNetworkGraph < Spinach::FeatureSteps
end
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
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
And
'page should have "master" on graph'
do
...
...
@@ -61,11 +61,11 @@ class ProjectNetworkGraph < Spinach::FeatureSteps
end
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
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
And
'page should have "stable" on graph'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录