Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
9694c816
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,发现更多精彩内容 >>
提交
9694c816
编写于
5月 11, 2015
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
上级
f1ba3769
e1a8089c
变更
11
显示空白变更内容
内联
并排
Showing
11 changed file
with
63 addition
and
37 deletion
+63
-37
CHANGELOG
CHANGELOG
+1
-0
app/controllers/projects/compare_controller.rb
app/controllers/projects/compare_controller.rb
+2
-1
app/controllers/uploads_controller.rb
app/controllers/uploads_controller.rb
+5
-5
app/helpers/compare_helper.rb
app/helpers/compare_helper.rb
+12
-13
app/views/events/event/_push.html.haml
app/views/events/event/_push.html.haml
+13
-1
app/views/projects/branches/_branch.html.haml
app/views/projects/branches/_branch.html.haml
+7
-4
app/views/projects/commits/_head.html.haml
app/views/projects/commits/_head.html.haml
+1
-1
app/views/projects/commits/show.html.haml
app/views/projects/commits/show.html.haml
+11
-5
app/views/projects/compare/_form.html.haml
app/views/projects/compare/_form.html.haml
+4
-3
doc/development/migration_style_guide.md
doc/development/migration_style_guide.md
+6
-3
features/steps/project/commits/commits.rb
features/steps/project/commits/commits.rb
+1
-1
未找到文件。
CHANGELOG
浏览文件 @
9694c816
...
...
@@ -50,6 +50,7 @@ v 7.11.0 (unreleased)
- Add footnotes support to Markdown (Guillaume Delbergue)
- Add current_sign_in_at to UserFull REST api.
- Make Sidekiq MemoryKiller shutdown signal configurable
- Add "Create Merge Request" buttons to commits and branches pages and push event.
v 7.10.2
- Fix CI links on MR page
...
...
app/controllers/projects/compare_controller.rb
浏览文件 @
9694c816
...
...
@@ -6,11 +6,12 @@ class Projects::CompareController < Projects::ApplicationController
before_action
:authorize_download_code!
def
index
@ref
=
Addressable
::
URI
.
unescape
(
params
[
:to
])
end
def
show
base_ref
=
Addressable
::
URI
.
unescape
(
params
[
:from
])
head_ref
=
Addressable
::
URI
.
unescape
(
params
[
:to
])
@ref
=
head_ref
=
Addressable
::
URI
.
unescape
(
params
[
:to
])
compare_result
=
CompareService
.
new
.
execute
(
current_user
,
...
...
app/controllers/uploads_controller.rb
浏览文件 @
9694c816
...
...
@@ -52,13 +52,13 @@ class UploadsController < ApplicationController
def
upload_model
upload_models
=
{
user:
User
,
project:
Project
,
note:
Note
,
group:
Group
"user"
=>
User
,
"project"
=>
Project
,
"note"
=>
Note
,
"group"
=>
Group
}
upload_models
[
params
[
:model
]
.
to_sym
]
upload_models
[
params
[
:model
]]
end
def
upload_mount
...
...
app/helpers/compare_helper.rb
浏览文件 @
9694c816
module
CompareHelper
def
compare_to_mr_button?
@project
.
merge_requests_enabled
&&
params
[
:from
].
present?
&&
params
[
:to
].
present?
&&
@repository
.
branch_names
.
include?
(
params
[
:from
])
&&
@repository
.
branch_names
.
include?
(
params
[
:to
])
&&
params
[
:from
]
!=
params
[
:to
]
&&
!
@refs_are_same
def
create_mr_button?
(
from
=
params
[
:from
],
to
=
params
[
:to
],
project
=
@project
)
from
.
present?
&&
to
.
present?
&&
from
!=
to
&&
project
.
merge_requests_enabled
&&
project
.
repository
.
branch_names
.
include?
(
from
)
&&
project
.
repository
.
branch_names
.
include?
(
to
)
end
def
c
ompare_mr_path
def
c
reate_mr_path
(
from
=
params
[
:from
],
to
=
params
[
:to
],
project
=
@project
)
new_namespace_project_merge_request_path
(
@
project
.
namespace
,
@
project
,
project
.
namespace
,
project
,
merge_request:
{
source_branch:
params
[
:to
]
,
target_branch:
params
[
:from
]
source_branch:
to
,
target_branch:
from
}
)
end
...
...
app/views/events/event/_push.html.haml
浏览文件 @
9694c816
...
...
@@ -17,15 +17,27 @@
-
few_commits
.
each
do
|
commit
|
=
render
"events/commit"
,
commit:
commit
,
project:
project
-
create_mr
=
current_user
==
event
.
author
&&
event
.
new_ref?
&&
create_mr_button?
(
event
.
project
.
default_branch
,
event
.
ref_name
,
event
.
project
)
-
if
event
.
commits_count
>
1
%li
.commits-stat
-
if
event
.
commits_count
>
2
%span
... and
#{
event
.
commits_count
-
2
}
more commits.
-
if
event
.
md_ref?
-
from
=
event
.
commit_from
-
from_label
=
truncate_sha
(
from
)
-
else
-
from
=
event
.
project
.
default_branch
-
from_label
=
from
=
link_to
namespace_project_compare_path
(
event
.
project
.
namespace
,
event
.
project
,
from:
from
,
to:
event
.
commit_to
)
do
%strong
Compare
→
#{
from_label
}
...
#{
truncate_sha
(
event
.
commit_to
)
}
Compare
#{
from_label
}
...
#{
truncate_sha
(
event
.
commit_to
)
}
-
if
create_mr
or
=
link_to
create_mr_path
(
event
.
project
.
default_branch
,
event
.
ref_name
,
event
.
project
)
do
create a merge request
-
elsif
create_mr
%li
.commits-stat
=
link_to
create_mr_path
(
event
.
project
.
default_branch
,
event
.
ref_name
,
event
.
project
)
do
Create Merge Request
app/views/projects/branches/_branch.html.haml
浏览文件 @
9694c816
...
...
@@ -10,16 +10,19 @@
%i
.fa.fa-lock
protected
.pull-right
-
if
can?
(
current_user
,
:download_code
,
@project
)
=
render
'projects/repositories/download_archive'
,
ref:
branch
.
name
,
btn_class:
'btn-grouped btn-group-xs'
-
if
create_mr_button?
(
@repository
.
root_ref
,
branch
.
name
)
=
link_to
create_mr_path
(
@repository
.
root_ref
,
branch
.
name
),
class:
'btn btn-grouped btn-xs'
do
=
icon
(
'plus'
)
Merge Request
-
if
branch
.
name
!=
@repository
.
root_ref
=
link_to
namespace_project_compare_index_path
(
@project
.
namespace
,
@project
,
from:
@repository
.
root_ref
,
to:
branch
.
name
),
class:
'btn btn-grouped btn-xs'
,
method: :post
,
title:
"Compare"
do
%i
.fa.fa-files-o
=
icon
(
"exchange"
)
Compare
-
if
can_remove_branch?
(
@project
,
branch
.
name
)
=
link_to
namespace_project_branch_path
(
@project
.
namespace
,
@project
,
branch
.
name
),
class:
'btn btn-grouped btn-xs btn-remove remove-row'
,
method: :delete
,
data:
{
confirm:
'Removed branch cannot be restored. Are you sure?'
},
remote:
true
do
%i
.fa.fa-trash-o
=
icon
(
"trash-o"
)
-
if
commit
%ul
.list-unstyled
...
...
app/views/projects/commits/_head.html.haml
浏览文件 @
9694c816
%ul
.nav.nav-tabs
=
nav_link
(
controller:
[
:commit
,
:commits
])
do
=
link_to
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@repository
.
root_ref
)
do
=
link_to
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@re
f
||
@re
pository
.
root_ref
)
do
Commits
%span
.badge
=
number_with_precision
(
@repository
.
commit_count
,
precision:
0
,
delimiter:
','
)
=
nav_link
(
controller: :compare
)
do
...
...
app/views/projects/commits/show.html.haml
浏览文件 @
9694c816
...
...
@@ -8,11 +8,17 @@
.tree-ref-holder
=
render
'shared/ref_switcher'
,
destination:
'commits'
-
if
current_user
&&
current_user
.
private_token
.commits-feed-holder.hidden-xs.hidden-sm
=
link_to
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@ref
,
{
format: :atom
,
private_token:
current_user
.
private_token
}),
title:
"Feed"
,
class:
'btn'
do
%i
.fa.fa-rss
Commits feed
.commits-feed-holder.hidden-xs.hidden-sm
-
if
create_mr_button?
(
@repository
.
root_ref
,
@ref
)
=
link_to
create_mr_path
(
@repository
.
root_ref
,
@ref
),
class:
'btn btn-success'
do
=
icon
(
'plus'
)
Create Merge Request
-
if
current_user
&&
current_user
.
private_token
=
link_to
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@ref
,
{
format: :atom
,
private_token:
current_user
.
private_token
}),
title:
"Feed"
,
class:
'prepend-left-10 btn'
do
=
icon
(
"rss"
)
Commits Feed
%ul
.breadcrumb.repo-breadcrumb
=
commits_breadcrumbs
...
...
app/views/projects/compare/_form.html.haml
浏览文件 @
9694c816
...
...
@@ -13,9 +13,10 @@
=
text_field_tag
:to
,
params
[
:to
],
class:
"form-control"
=
button_tag
"Compare"
,
class:
"btn btn-create commits-compare-btn"
-
if
compare_to_mr_button?
=
link_to
compare_mr_path
,
class:
'prepend-left-10 btn'
do
%strong
Make a merge request
-
if
create_mr_button?
=
link_to
create_mr_path
,
class:
'prepend-left-10 btn'
do
=
icon
(
"plus"
)
Create Merge Request
:javascript
...
...
doc/development/migration_style_guide.md
浏览文件 @
9694c816
# Migration Style Guide
When writing migrations for GitLab, you have to take into account that
these will be ran by thousands of organizations of all sizes, some with
these will be ran by
hundreds of
thousands of organizations of all sizes, some with
many years of data in their database.
In addition, having to take a server offline for a an upgrade small or big is
a big burden for most organizations. For this reason it is important that your
migrations are written carefully and adhere to the style guide below.
migrations are written carefully
, can be applied online
and adhere to the style guide below.
When writing your migrations, also consider that databases might have stale data
or inconsistencies and guard for that. Try to make as little assumptions as possible
about the state of the database.
Please don't depend on GitLab specific code since it can change in future versions.
If needed copy-paste GitLab code into the migration to make make it forward compatible.
## Comments in the migration
Each migration you write needs to have the two following pieces of information
...
...
features/steps/project/commits/commits.rb
浏览文件 @
9694c816
...
...
@@ -12,7 +12,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
end
step
'I click atom feed link'
do
click_link
"Feed"
click_link
"
Commits
Feed"
end
step
'I see commits atom feed'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录