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
b7d83acf
Commit
b7d83acf
authored
May 18, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
parents
253a017b
e577bf2d
Changes
27
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
27 changed files
with
160 additions
and
72 deletions
+160
-72
CHANGELOG
CHANGELOG
+7
-1
app/assets/images/ci/arch.jpg
app/assets/images/ci/arch.jpg
+0
-0
app/assets/images/ci/favicon.ico
app/assets/images/ci/favicon.ico
+0
-0
app/assets/images/ci/loader.gif
app/assets/images/ci/loader.gif
+0
-0
app/assets/images/ci/no_avatar.png
app/assets/images/ci/no_avatar.png
+0
-0
app/assets/images/ci/rails.png
app/assets/images/ci/rails.png
+0
-0
app/assets/images/ci/service_sample.png
app/assets/images/ci/service_sample.png
+0
-0
app/assets/stylesheets/framework/zen.scss
app/assets/stylesheets/framework/zen.scss
+1
-1
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+1
-1
app/controllers/projects/imports_controller.rb
app/controllers/projects/imports_controller.rb
+1
-0
app/models/project.rb
app/models/project.rb
+0
-5
app/models/project_services/slack_service/issue_message.rb
app/models/project_services/slack_service/issue_message.rb
+16
-3
app/services/projects/create_service.rb
app/services/projects/create_service.rb
+14
-7
app/views/groups/_activities.html.haml
app/views/groups/_activities.html.haml
+1
-1
app/views/groups/issues.atom.builder
app/views/groups/issues.atom.builder
+4
-4
app/views/projects/_md_preview.html.haml
app/views/projects/_md_preview.html.haml
+1
-1
app/views/projects/_zen.html.haml
app/views/projects/_zen.html.haml
+1
-1
config/initializers/metrics.rb
config/initializers/metrics.rb
+2
-0
doc/api/README.md
doc/api/README.md
+1
-1
doc/ci/quick_start/README.md
doc/ci/quick_start/README.md
+2
-2
lib/api/notes.rb
lib/api/notes.rb
+29
-18
lib/gitlab/bitbucket_import/project_creator.rb
lib/gitlab/bitbucket_import/project_creator.rb
+2
-5
lib/gitlab/fogbugz_import/project_creator.rb
lib/gitlab/fogbugz_import/project_creator.rb
+3
-6
lib/gitlab/gitlab_import/importer.rb
lib/gitlab/gitlab_import/importer.rb
+1
-1
lib/gitlab/google_code_import/project_creator.rb
lib/gitlab/google_code_import/project_creator.rb
+3
-6
spec/models/project_services/slack_service/issue_message_spec.rb
...dels/project_services/slack_service/issue_message_spec.rb
+6
-5
spec/requests/api/notes_spec.rb
spec/requests/api/notes_spec.rb
+64
-3
No files found.
CHANGELOG
View file @
b7d83acf
...
...
@@ -21,6 +21,7 @@ v 8.8.0 (unreleased)
- Bump mail_room to 0.7.0 to fix stuck IDLE connections
- Remove future dates from contribution calendar graph.
- Support e-mail notifications for comments on project snippets
- Fix API leak of notes of unauthorized issues, snippets and merge requests
- Use ActionDispatch Remote IP for Akismet checking
- Fix error when visiting commit builds page before build was updated
- Add 'l' shortcut to open Label dropdown on issuables and 'i' to create new issue on a project
...
...
@@ -38,6 +39,7 @@ v 8.8.0 (unreleased)
- Create tags using Rugged for performance reasons. !3745
- API: Expose Issue#user_notes_count. !3126 (Anton Popov)
- Don't show forks button when user can't view forks
- Fix atom feed links and rendering
- Files over 5MB can only be viewed in their raw form, files over 1MB without highlighting !3718
- Add support for supressing text diffs using .gitattributes on the default branch (Matt Oakes)
- Add eager load paths to help prevent dependency load issues in Sidekiq workers. !3724
...
...
@@ -57,9 +59,13 @@ v 8.8.0 (unreleased)
- Redesign navigation for profile and group pages
- Add counter metrics for rails cache
- Import pull requests from GitHub where the source or target branches were removed
- All Grape API helpers are now instrumented
- Improve Issue formatting for the Slack Service (Jeroen van Baarsen)
v 8.7.6
- Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko)
- Fix import from GitLab.com to a private instance failure. !4181
- Fix external imports not finding the import data. !4106
v 8.7.5
- Fix relative links in wiki pages. !4050
...
...
@@ -889,7 +895,7 @@ v 8.1.3
- Use issue editor as cross reference comment author when issue is edited with a new mention
- Add Facebook authentication
v 8.1.
2
v 8.1.
1
- Fix cloning Wiki repositories via HTTP (Stan Hu)
- Add migration to remove satellites directory
- Fix specific runners visibility
...
...
app/assets/images/ci/arch.jpg
deleted
100644 → 0
View file @
253a017b
24.6 KB
app/assets/images/ci/favicon.ico
deleted
100644 → 0
View file @
253a017b
5.3 KB
app/assets/images/ci/loader.gif
deleted
100644 → 0
View file @
253a017b
4.3 KB
app/assets/images/ci/no_avatar.png
deleted
100644 → 0
View file @
253a017b
1.31 KB
app/assets/images/ci/rails.png
deleted
100644 → 0
View file @
253a017b
6.49 KB
app/assets/images/ci/service_sample.png
deleted
100644 → 0
View file @
253a017b
74.2 KB
app/assets/stylesheets/framework/zen.scss
View file @
b7d83acf
...
...
@@ -32,7 +32,7 @@
}
}
.zen-cotrol
{
.zen-co
n
trol
{
padding
:
0
;
color
:
#555
;
background
:
none
;
...
...
app/assets/stylesheets/pages/projects.scss
View file @
b7d83acf
...
...
@@ -7,7 +7,7 @@
}
.no-ssh-key-message
,
.project-limit-message
{
background-color
:
#f28d35
;
margin-bottom
:
16px
;
margin-bottom
:
0
;
}
.new_project
,
.edit_project
{
...
...
app/controllers/projects/imports_controller.rb
View file @
b7d83acf
...
...
@@ -20,6 +20,7 @@ class Projects::ImportsController < Projects::ApplicationController
@project
.
import_retry
else
@project
.
import_start
@project
.
add_import_job
end
end
...
...
app/models/project.rb
View file @
b7d83acf
...
...
@@ -204,7 +204,6 @@ class Project < ActiveRecord::Base
state
:finished
state
:failed
after_transition
any
=>
:started
,
do: :schedule_add_import_job
after_transition
any
=>
:finished
,
do: :clear_import_data
end
...
...
@@ -349,10 +348,6 @@ class Project < ActiveRecord::Base
id
&&
persisted?
end
def
schedule_add_import_job
run_after_commit
(
:add_import_job
)
end
def
add_import_job
if
forked?
job_id
=
RepositoryForkWorker
.
perform_async
(
self
.
id
,
forked_from_project
.
path_with_namespace
,
self
.
namespace
.
path
)
...
...
app/models/project_services/slack_service/issue_message.rb
View file @
b7d83acf
...
...
@@ -34,7 +34,12 @@ class SlackService
private
def
message
"
#{
user_name
}
#{
state
}
#{
issue_link
}
in
#{
project_link
}
: *
#{
title
}
*"
case
state
when
"opened"
"[
#{
project_link
}
] Issue
#{
state
}
by
#{
user_name
}
"
else
"[
#{
project_link
}
] Issue
#{
issue_link
}
#{
state
}
by
#{
user_name
}
"
end
end
def
opened_issue?
...
...
@@ -42,7 +47,11 @@ class SlackService
end
def
description_message
[{
text:
format
(
description
),
color:
attachment_color
}]
[{
title:
issue_title
,
title_link:
issue_url
,
text:
format
(
description
),
color:
"#C95823"
}]
end
def
project_link
...
...
@@ -50,7 +59,11 @@ class SlackService
end
def
issue_link
"[issue #
#{
issue_iid
}
](
#{
issue_url
}
)"
"[
#{
issue_title
}
](
#{
issue_url
}
)"
end
def
issue_title
"#
#{
issue_iid
}
#{
title
}
"
end
end
end
app/services/projects/create_service.rb
View file @
b7d83acf
...
...
@@ -6,6 +6,7 @@ module Projects
def
execute
forked_from_project_id
=
params
.
delete
(
:forked_from_project_id
)
import_data
=
params
.
delete
(
:import_data
)
@project
=
Project
.
new
(
params
)
...
...
@@ -49,16 +50,14 @@ module Projects
@project
.
build_forked_project_link
(
forked_from_project_id:
forked_from_project_id
)
end
Project
.
transaction
do
@project
.
save
save_project_and_import_data
(
import_data
)
if
@project
.
persisted?
&&
!
@project
.
import?
raise
'Failed to create repository'
unless
@project
.
create_repository
end
end
@project
.
import_start
if
@project
.
import?
after_create_actions
if
@project
.
persisted?
@project
.
add_import_job
if
@project
.
import?
@project
rescue
=>
e
message
=
"Unable to save project:
#{
e
.
message
}
"
...
...
@@ -93,8 +92,16 @@ module Projects
unless
@project
.
group
@project
.
team
<<
[
current_user
,
:master
,
current_user
]
end
end
@project
.
import_start
if
@project
.
import?
def
save_project_and_import_data
(
import_data
)
Project
.
transaction
do
@project
.
create_or_update_import_data
(
data:
import_data
[
:data
],
credentials:
import_data
[
:credentials
])
if
import_data
if
@project
.
save
&&
!
@project
.
import?
raise
'Failed to create repository'
unless
@project
.
create_repository
end
end
end
end
end
app/views/groups/_activities.html.haml
View file @
b7d83acf
...
...
@@ -4,7 +4,7 @@
.nav-block
-
if
current_user
.controls
=
link_to
dashboard_projects_path
(
:atom
,
{
private_token:
current_user
.
private_token
}
),
class:
'btn rss-btn'
do
=
link_to
group_path
(
@group
,
format: :atom
,
private_token:
current_user
.
private_token
),
class:
'btn rss-btn'
do
%i
.fa.fa-rss
=
render
'shared/event_filter'
...
...
app/views/groups/issues.atom.builder
View file @
b7d83acf
xml.instruct!
xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
xml.title "#{@
user
.name} issues"
xml.link href: issues_
dashboard_url(format: :atom, private_token: @user.private_token
), rel: "self", type: "application/atom+xml"
xml.link href: issues_
dashboard
_url, rel: "alternate", type: "text/html"
xml.id issues_
dashboard
_url
xml.title "#{@
group
.name} issues"
xml.link href: issues_
group_url(format: :atom, private_token: current_user.try(:private_token)
), rel: "self", type: "application/atom+xml"
xml.link href: issues_
group
_url, rel: "alternate", type: "text/html"
xml.id issues_
group
_url
xml.updated @issues.first.created_at.xmlschema if @issues.any?
@issues.each do |issue|
...
...
app/views/projects/_md_preview.html.haml
View file @
b7d83acf
...
...
@@ -8,7 +8,7 @@
%a
.js-md-preview-button
{
href:
"#md-preview-holder"
,
tabindex:
-
1
}
Preview
%li
.pull-right
%button
.zen-cotrol.zen-control-full.js-zen-enter
{
type:
'button'
,
tabindex:
-
1
}
%button
.zen-co
n
trol.zen-control-full.js-zen-enter
{
type:
'button'
,
tabindex:
-
1
}
Go full screen
.md-write-holder
...
...
app/views/projects/_zen.html.haml
View file @
b7d83acf
...
...
@@ -4,5 +4,5 @@
=
f
.
text_area
attr
,
class:
classes
,
placeholder:
placeholder
-
else
=
text_area_tag
attr
,
nil
,
class:
classes
,
placeholder:
placeholder
%a
.zen-cotrol.zen-control-leave.js-zen-leave
{
href:
"#"
}
%a
.zen-co
n
trol.zen-control-leave.js-zen-leave
{
href:
"#"
}
=
icon
(
'compress'
)
config/initializers/metrics.rb
View file @
b7d83acf
...
...
@@ -118,6 +118,8 @@ if Gitlab::Metrics.enabled?
# Instrument the classes used for checking if somebody has push access.
config
.
instrument_instance_methods
(
Gitlab
::
GitAccess
)
config
.
instrument_instance_methods
(
Gitlab
::
GitAccessWiki
)
config
.
instrument_instance_methods
(
API
::
Helpers
)
end
GC
::
Profiler
.
enable
...
...
doc/api/README.md
View file @
b7d83acf
...
...
@@ -33,7 +33,7 @@ following locations:
-
[
Build triggers
](
build_triggers.md
)
-
[
Build Variables
](
build_variables.md
)
-
[
Runners
](
runners.md
)
-
[
Licens
es
](
licenses.md
)
-
[
Open source license templat
es
](
licenses.md
)
## Authentication
...
...
doc/ci/quick_start/README.md
View file @
b7d83acf
...
...
@@ -212,8 +212,8 @@ If you want to receive e-mail notifications about the result status of the
builds, you should explicitly enable the
**Builds Emails**
service under your
project's settings.
For more information read the
[Builds emails service documentation]
(../../project_services/builds_emails.md).
For more information read the
[
Builds emails service documentation
]
(
../../project_services/builds_emails.md
)
.
## Builds badge
...
...
lib/api/notes.rb
View file @
b7d83acf
...
...
@@ -19,20 +19,24 @@ module API
# GET /projects/:id/issues/:noteable_id/notes
# GET /projects/:id/snippets/:noteable_id/notes
get
":id/
#{
noteables_str
}
/:
#{
noteable_id_str
}
/notes"
do
@noteable
=
user_project
.
send
(
:"
#{
noteables_str
}
"
).
find
(
params
[
:"
#{
noteable_id_str
}
"
])
# We exclude notes that are cross-references and that cannot be viewed
# by the current user. By doing this exclusion at this level and not
# at the DB query level (which we cannot in that case), the current
# page can have less elements than :per_page even if
# there's more than one page.
notes
=
# paginate() only works with a relation. This could lead to a
# mismatch between the pagination headers info and the actual notes
# array returned, but this is really a edge-case.
paginate
(
@noteable
.
notes
).
reject
{
|
n
|
n
.
cross_reference_not_visible_for?
(
current_user
)
}
present
notes
,
with:
Entities
::
Note
@noteable
=
user_project
.
send
(
noteables_str
.
to_sym
).
find
(
params
[
noteable_id_str
.
to_sym
])
if
can?
(
current_user
,
noteable_read_ability_name
(
@noteable
),
@noteable
)
# We exclude notes that are cross-references and that cannot be viewed
# by the current user. By doing this exclusion at this level and not
# at the DB query level (which we cannot in that case), the current
# page can have less elements than :per_page even if
# there's more than one page.
notes
=
# paginate() only works with a relation. This could lead to a
# mismatch between the pagination headers info and the actual notes
# array returned, but this is really a edge-case.
paginate
(
@noteable
.
notes
).
reject
{
|
n
|
n
.
cross_reference_not_visible_for?
(
current_user
)
}
present
notes
,
with:
Entities
::
Note
else
not_found!
(
"Notes"
)
end
end
# Get a single +noteable+ note
...
...
@@ -45,13 +49,14 @@ module API
# GET /projects/:id/issues/:noteable_id/notes/:note_id
# GET /projects/:id/snippets/:noteable_id/notes/:note_id
get
":id/
#{
noteables_str
}
/:
#{
noteable_id_str
}
/notes/:note_id"
do
@noteable
=
user_project
.
send
(
:"
#{
noteables_str
}
"
).
find
(
params
[
:"
#{
noteable_id_str
}
"
])
@noteable
=
user_project
.
send
(
noteables_str
.
to_sym
).
find
(
params
[
noteable_id_str
.
to_sym
])
@note
=
@noteable
.
notes
.
find
(
params
[
:note_id
])
can_read_note
=
can?
(
current_user
,
noteable_read_ability_name
(
@noteable
),
@noteable
)
&&
!
@note
.
cross_reference_not_visible_for?
(
current_user
)
if
@note
.
cross_reference_not_visible_for?
(
current_user
)
not_found!
(
"Note"
)
else
if
can_read_note
present
@note
,
with:
Entities
::
Note
else
not_found!
(
"Note"
)
end
end
...
...
@@ -136,5 +141,11 @@ module API
end
end
end
helpers
do
def
noteable_read_ability_name
(
noteable
)
"read_
#{
noteable
.
class
.
to_s
.
underscore
.
downcase
}
"
.
to_sym
end
end
end
end
lib/gitlab/bitbucket_import/project_creator.rb
View file @
b7d83acf
...
...
@@ -11,7 +11,7 @@ module Gitlab
end
def
execute
project
=
::
Projects
::
CreateService
.
new
(
::
Projects
::
CreateService
.
new
(
current_user
,
name:
repo
[
"name"
],
path:
repo
[
"slug"
],
...
...
@@ -21,11 +21,8 @@ module Gitlab
import_type:
"bitbucket"
,
import_source:
"
#{
repo
[
"owner"
]
}
/
#{
repo
[
"slug"
]
}
"
,
import_url:
"ssh://git@bitbucket.org/
#{
repo
[
"owner"
]
}
/
#{
repo
[
"slug"
]
}
.git"
,
import_data:
{
credentials:
{
bb_session:
session_data
}
}
).
execute
project
.
create_or_update_import_data
(
credentials:
{
bb_session:
session_data
})
project
end
end
end
...
...
lib/gitlab/fogbugz_import/project_creator.rb
View file @
b7d83acf
...
...
@@ -12,7 +12,7 @@ module Gitlab
end
def
execute
project
=
::
Projects
::
CreateService
.
new
(
::
Projects
::
CreateService
.
new
(
current_user
,
name:
repo
.
safe_name
,
path:
repo
.
path
,
...
...
@@ -21,12 +21,9 @@ module Gitlab
visibility_level:
Gitlab
::
VisibilityLevel
::
INTERNAL
,
import_type:
'fogbugz'
,
import_source:
repo
.
name
,
import_url:
Project
::
UNKNOWN_IMPORT_URL
import_url:
Project
::
UNKNOWN_IMPORT_URL
,
import_data:
{
data:
{
'repo'
=>
repo
.
raw_data
,
'user_map'
=>
user_map
},
credentials:
{
fb_session:
fb_session
}
}
).
execute
project
.
create_or_update_import_data
(
data:
{
'repo'
=>
repo
.
raw_data
,
'user_map'
=>
user_map
},
credentials:
{
fb_session:
fb_session
})
project
end
end
end
...
...
lib/gitlab/gitlab_import/importer.rb
View file @
b7d83acf
...
...
@@ -5,7 +5,7 @@ module Gitlab
def
initialize
(
project
)
@project
=
project
credentials
=
import_data
credentials
=
project
.
import_data
if
credentials
&&
credentials
[
:password
]
@client
=
Client
.
new
(
credentials
[
:password
])
@formatter
=
Gitlab
::
ImportFormatter
.
new
...
...
lib/gitlab/google_code_import/project_creator.rb
View file @
b7d83acf
...
...
@@ -11,7 +11,7 @@ module Gitlab
end
def
execute
project
=
::
Projects
::
CreateService
.
new
(
::
Projects
::
CreateService
.
new
(
current_user
,
name:
repo
.
name
,
path:
repo
.
name
,
...
...
@@ -21,12 +21,9 @@ module Gitlab
visibility_level:
Gitlab
::
VisibilityLevel
::
PUBLIC
,
import_type:
"google_code"
,
import_source:
repo
.
name
,
import_url:
repo
.
import_url
import_url:
repo
.
import_url
,
import_data:
{
data:
{
'repo'
=>
repo
.
raw_data
,
'user_map'
=>
user_map
}
}
).
execute
project
.
create_or_update_import_data
(
data:
{
'repo'
=>
repo
.
raw_data
,
'user_map'
=>
user_map
})
project
end
end
end
...
...
spec/models/project_services/slack_service/issue_message_spec.rb
View file @
b7d83acf
...
...
@@ -25,7 +25,7 @@ describe SlackService::IssueMessage, models: true do
}
end
let
(
:color
)
{
'#
345
'
}
let
(
:color
)
{
'#
C95823
'
}
context
'#initialize'
do
before
do
...
...
@@ -40,10 +40,11 @@ describe SlackService::IssueMessage, models: true do
context
'open'
do
it
'returns a message regarding opening of issues'
do
expect
(
subject
.
pretext
).
to
eq
(
'Test User opened <url|issue #100> in <somewhere.com|project_name>: '
\
'*Issue title*'
)
'<somewhere.com|[project_name>] Issue opened by Test User'
)
expect
(
subject
.
attachments
).
to
eq
([
{
title:
"#100 Issue title"
,
title_link:
"url"
,
text:
"issue description"
,
color:
color
,
}
...
...
@@ -56,10 +57,10 @@ describe SlackService::IssueMessage, models: true do
args
[
:object_attributes
][
:action
]
=
'close'
args
[
:object_attributes
][
:state
]
=
'closed'
end
it
'returns a message regarding closing of issues'
do
expect
(
subject
.
pretext
).
to
eq
(
'Test User closed <url|issue #100> in <somewhere.com|project_name>: '
\
'*Issue title*'
)
'<somewhere.com|[project_name>] Issue <url|#100 Issue title> closed by Test User'
)
expect
(
subject
.
attachments
).
to
be_empty
end
end
...
...
spec/requests/api/notes_spec.rb
View file @
b7d83acf
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