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
iv
gitlab-ce
Commits
84473c75
Commit
84473c75
authored
Feb 29, 2016
by
Douwe Maan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into mail-room-config-without-rails
parents
e1baa485
f838dbe4
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
181 additions
and
41 deletions
+181
-41
CHANGELOG
CHANGELOG
+6
-3
app/models/project.rb
app/models/project.rb
+1
-4
app/models/repository.rb
app/models/repository.rb
+40
-9
app/services/git_push_service.rb
app/services/git_push_service.rb
+3
-3
app/services/git_tag_push_service.rb
app/services/git_tag_push_service.rb
+1
-1
app/services/projects/destroy_service.rb
app/services/projects/destroy_service.rb
+2
-4
app/validators/url_validator.rb
app/validators/url_validator.rb
+3
-0
app/workers/repository_fork_worker.rb
app/workers/repository_fork_worker.rb
+1
-1
app/workers/repository_import_worker.rb
app/workers/repository_import_worker.rb
+1
-1
doc/permissions/permissions.md
doc/permissions/permissions.md
+1
-1
spec/features/issues/filter_by_milestone_spec.rb
spec/features/issues/filter_by_milestone_spec.rb
+2
-2
spec/models/hooks/project_hook_spec.rb
spec/models/hooks/project_hook_spec.rb
+4
-0
spec/models/hooks/web_hook_spec.rb
spec/models/hooks/web_hook_spec.rb
+10
-10
spec/models/repository_spec.rb
spec/models/repository_spec.rb
+106
-2
No files found.
CHANGELOG
View file @
84473c75
...
...
@@ -4,6 +4,12 @@ v 8.6.0 (unreleased)
- Improve the formatting for the user page bio (Connor Shea)
- Fix avatar stretching by providing a cropping feature (Johann Pardanaud)
- Don't load all of GitLab in mail_room
- Strip leading and trailing spaces in URL validator (evuez)
- Update documentation to reflect Guest role not being enforced on internal projects
v 8.5.2
- Fix sidebar overlapping content when screen width was below 1200px
- Fix error 500 when commenting on a commit
v 8.5.1
- Fix group projects styles
...
...
@@ -24,9 +30,6 @@ v 8.5.1
- Update sentry-raven gem to 0.15.6
- Add build coverage in project's builds page (Steffen Köhler)
v 8.5.2
- Fix error 500 when commenting on a commit
v 8.5.0
- Fix duplicate "me" in tooltip of the "thumbsup" awards Emoji (Stan Hu)
- Cache various Repository methods to improve performance (Yorick Peterse)
...
...
app/models/project.rb
View file @
84473c75
...
...
@@ -801,10 +801,7 @@ class Project < ActiveRecord::Base
end
def
change_head
(
branch
)
# Cached divergent commit counts are based on repository head
repository
.
expire_branch_cache
repository
.
expire_root_ref_cache
repository
.
before_change_head
gitlab_shell
.
update_repository_head
(
self
.
path_with_namespace
,
branch
)
reload_default_branch
end
...
...
app/models/repository.rb
View file @
84473c75
...
...
@@ -245,15 +245,6 @@ class Repository
expire_emptiness_caches
if
empty?
end
# Expires _all_ caches, including those that would normally only be expired
# under specific conditions.
def
expire_all_caches!
expire_cache
expire_root_ref_cache
expire_emptiness_caches
expire_has_visible_content_cache
end
def
expire_branch_cache
(
branch_name
=
nil
)
# When we push to the root branch we have to flush the cache for all other
# branches as their statistics are based on the commits relative to the
...
...
@@ -307,6 +298,46 @@ class Repository
cache
.
expire
(
:branch_names
)
end
# Runs code just before a repository is deleted.
def
before_delete
expire_cache
if
exists?
expire_root_ref_cache
expire_emptiness_caches
end
# Runs code just before the HEAD of a repository is changed.
def
before_change_head
# Cached divergent commit counts are based on repository head
expire_branch_cache
expire_root_ref_cache
end
# Runs code before creating a new tag.
def
before_create_tag
expire_cache
end
# Runs code after a repository has been forked/imported.
def
after_import
expire_emptiness_caches
end
# Runs code after a new commit has been pushed.
def
after_push_commit
(
branch_name
)
expire_cache
(
branch_name
)
end
# Runs code after a new branch has been created.
def
after_create_branch
expire_has_visible_content_cache
end
# Runs code after an existing branch has been removed.
def
after_remove_branch
expire_has_visible_content_cache
end
def
method_missing
(
m
,
*
args
,
&
block
)
if
m
==
:lookup
&&
!
block_given?
lookup_cache
[
m
]
||=
{}
...
...
app/services/git_push_service.rb
View file @
84473c75
...
...
@@ -16,13 +16,13 @@ class GitPushService < BaseService
# 5. Executes the project's services
#
def
execute
@project
.
repository
.
expire_cache
(
branch_name
)
@project
.
repository
.
after_push_commit
(
branch_name
)
if
push_remove_branch?
@project
.
repository
.
expire_has_visible_content_cache
@project
.
repository
.
after_remove_branch
@push_commits
=
[]
elsif
push_to_new_branch?
@project
.
repository
.
expire_has_visible_content_cache
@project
.
repository
.
after_create_branch
# Re-find the pushed commits.
if
is_default_branch?
...
...
app/services/git_tag_push_service.rb
View file @
84473c75
...
...
@@ -2,7 +2,7 @@ class GitTagPushService
attr_accessor
:project
,
:user
,
:push_data
def
execute
(
project
,
user
,
oldrev
,
newrev
,
ref
)
project
.
repository
.
expire_cache
project
.
repository
.
before_create_tag
@project
,
@user
=
project
,
user
@push_data
=
build_push_data
(
oldrev
,
newrev
,
ref
)
...
...
app/services/projects/destroy_service.rb
View file @
84473c75
...
...
@@ -76,11 +76,9 @@ module Projects
end
def
flush_caches
(
project
,
wiki_path
)
project
.
repository
.
expire_all_caches!
if
project
.
repository
.
exists?
project
.
repository
.
before_delete
wiki_repo
=
Repository
.
new
(
wiki_path
,
project
)
wiki_repo
.
expire_all_caches!
if
wiki_repo
.
exists?
Repository
.
new
(
wiki_path
,
project
).
before_delete
end
end
end
app/validators/url_validator.rb
View file @
84473c75
...
...
@@ -29,8 +29,11 @@ class UrlValidator < ActiveModel::EachValidator
end
def
valid_url?
(
value
)
return
false
if
value
.
nil?
options
=
default_options
.
merge
(
self
.
options
)
value
.
strip!
value
=~
/\A
#{
URI
.
regexp
(
options
[
:protocols
])
}
\z/
end
end
app/workers/repository_fork_worker.rb
View file @
84473c75
...
...
@@ -27,7 +27,7 @@ class RepositoryForkWorker
return
end
project
.
repository
.
expire_emptiness_caches
project
.
repository
.
after_import
project
.
import_finish
end
end
app/workers/repository_import_worker.rb
View file @
84473c75
...
...
@@ -18,7 +18,7 @@ class RepositoryImportWorker
return
end
project
.
repository
.
expire_emptiness_caches
project
.
repository
.
after_import
project
.
import_finish
end
end
doc/permissions/permissions.md
View file @
84473c75
...
...
@@ -6,7 +6,7 @@ If a user is both in a project group and in the project itself, the highest perm
If a user is a GitLab administrator they receive all permissions.
On public projects the Guest role is not enforced.
On public
and internal
projects the Guest role is not enforced.
All users will be able to create issues, leave comments, and pull or download the project code.
To add or import a user, you can follow the
[
project users and members
...
...
spec/features/issues/filter_by_milestone_spec.rb
View file @
84473c75
...
...
@@ -13,7 +13,7 @@ feature 'Issue filtering by Milestone', feature: true do
visit_issues
(
project
)
filter_by_milestone
(
Milestone
::
None
.
title
)
expect
(
page
).
to
have_css
(
'.title'
,
count:
1
)
expect
(
page
).
to
have_css
(
'.
issue .
title'
,
count:
1
)
end
scenario
'filters by a specific Milestone'
,
js:
true
do
...
...
@@ -23,7 +23,7 @@ feature 'Issue filtering by Milestone', feature: true do
visit_issues
(
project
)
filter_by_milestone
(
milestone
.
title
)
expect
(
page
).
to
have_css
(
'.title'
,
count:
1
)
expect
(
page
).
to
have_css
(
'.
issue .
title'
,
count:
1
)
end
def
visit_issues
(
project
)
...
...
spec/models/hooks/project_hook_spec.rb
View file @
84473c75
...
...
@@ -19,6 +19,10 @@
require
'spec_helper'
describe
ProjectHook
,
models:
true
do
describe
"Associations"
do
it
{
is_expected
.
to
belong_to
:project
}
end
describe
'.push_hooks'
do
it
'should return hooks for push events only'
do
hook
=
create
(
:project_hook
,
push_events:
true
)
...
...
spec/models/hooks/web_hook_spec.rb
View file @
84473c75
...
...
@@ -18,20 +18,14 @@
require
'spec_helper'
describe
ProjectHook
,
models:
true
do
describe
"Associations"
do
it
{
is_expected
.
to
belong_to
:project
}
end
describe
"Mass assignment"
do
end
describe
WebHook
,
models:
true
do
describe
"Validations"
do
it
{
is_expected
.
to
validate_presence_of
(
:url
)
}
context
"url format"
do
describe
'url'
do
it
{
is_expected
.
to
allow_value
(
"http://example.com"
).
for
(
:url
)
}
it
{
is_expected
.
to
allow_value
(
"https://excample.com"
).
for
(
:url
)
}
it
{
is_expected
.
to
allow_value
(
"https://example.com"
).
for
(
:url
)
}
it
{
is_expected
.
to
allow_value
(
" https://example.com "
).
for
(
:url
)
}
it
{
is_expected
.
to
allow_value
(
"http://test.com/api"
).
for
(
:url
)
}
it
{
is_expected
.
to
allow_value
(
"http://test.com/api?key=abc"
).
for
(
:url
)
}
it
{
is_expected
.
to
allow_value
(
"http://test.com/api?key=abc&type=def"
).
for
(
:url
)
}
...
...
@@ -39,6 +33,12 @@ describe ProjectHook, models: true do
it
{
is_expected
.
not_to
allow_value
(
"example.com"
).
for
(
:url
)
}
it
{
is_expected
.
not_to
allow_value
(
"ftp://example.com"
).
for
(
:url
)
}
it
{
is_expected
.
not_to
allow_value
(
"herp-and-derp"
).
for
(
:url
)
}
it
'strips :url before saving it'
do
hook
=
create
(
:project_hook
,
url:
' https://example.com '
)
expect
(
hook
.
url
).
to
eq
(
'https://example.com'
)
end
end
end
...
...
spec/models/repository_spec.rb
View file @
84473c75
...
...
@@ -362,14 +362,14 @@ describe Repository, models: true do
repository
.
expire_cache
(
'master'
)
end
it
'expires the emptiness cache for an empty repository'
do
it
'expires the emptiness cache
s
for an empty repository'
do
expect
(
repository
).
to
receive
(
:empty?
).
and_return
(
true
)
expect
(
repository
).
to
receive
(
:expire_emptiness_caches
)
repository
.
expire_cache
end
it
'does not expire the emptiness cache for a non-empty repository'
do
it
'does not expire the emptiness cache
s
for a non-empty repository'
do
expect
(
repository
).
to
receive
(
:empty?
).
and_return
(
false
)
expect
(
repository
).
to_not
receive
(
:expire_emptiness_caches
)
...
...
@@ -464,4 +464,108 @@ describe Repository, models: true do
expect
(
repository
.
blob_at_branch
(
'master'
,
'files/ruby/feature.rb'
)).
not_to
be_present
end
end
describe
'#before_delete'
do
describe
'when a repository does not exist'
do
before
do
allow
(
repository
).
to
receive
(
:exists?
).
and_return
(
false
)
end
it
'does not flush caches that depend on repository data'
do
expect
(
repository
).
to_not
receive
(
:expire_cache
)
repository
.
before_delete
end
it
'flushes the root ref cache'
do
expect
(
repository
).
to
receive
(
:expire_root_ref_cache
)
repository
.
before_delete
end
it
'flushes the emptiness caches'
do
expect
(
repository
).
to
receive
(
:expire_emptiness_caches
)
repository
.
before_delete
end
end
describe
'when a repository exists'
do
before
do
allow
(
repository
).
to
receive
(
:exists?
).
and_return
(
true
)
end
it
'flushes the caches that depend on repository data'
do
expect
(
repository
).
to
receive
(
:expire_cache
)
repository
.
before_delete
end
it
'flushes the root ref cache'
do
expect
(
repository
).
to
receive
(
:expire_root_ref_cache
)
repository
.
before_delete
end
it
'flushes the emptiness caches'
do
expect
(
repository
).
to
receive
(
:expire_emptiness_caches
)
repository
.
before_delete
end
end
end
describe
'#before_change_head'
do
it
'flushes the branch cache'
do
expect
(
repository
).
to
receive
(
:expire_branch_cache
)
repository
.
before_change_head
end
it
'flushes the root ref cache'
do
expect
(
repository
).
to
receive
(
:expire_root_ref_cache
)
repository
.
before_change_head
end
end
describe
'#before_create_tag'
do
it
'flushes the cache'
do
expect
(
repository
).
to
receive
(
:expire_cache
)
repository
.
before_create_tag
end
end
describe
'#after_import'
do
it
'flushes the emptiness cachess'
do
expect
(
repository
).
to
receive
(
:expire_emptiness_caches
)
repository
.
after_import
end
end
describe
'#after_push_commit'
do
it
'flushes the cache'
do
expect
(
repository
).
to
receive
(
:expire_cache
).
with
(
'master'
)
repository
.
after_push_commit
(
'master'
)
end
end
describe
'#after_create_branch'
do
it
'flushes the visible content cache'
do
expect
(
repository
).
to
receive
(
:expire_has_visible_content_cache
)
repository
.
after_create_branch
end
end
describe
'#after_remove_branch'
do
it
'flushes the visible content cache'
do
expect
(
repository
).
to
receive
(
:expire_has_visible_content_cache
)
repository
.
after_remove_branch
end
end
end
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