Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
GitLab
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
projects.thm.de
GitLab
Commits
40a956eb
Commit
40a956eb
authored
Jan 03, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Few more fixes after removing roles
parent
cac77234
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
2 additions
and
19 deletions
+2
-19
app/models/event.rb
app/models/event.rb
+0
-3
app/models/merge_request.rb
app/models/merge_request.rb
+1
-1
spec/models/project_spec.rb
spec/models/project_spec.rb
+0
-8
spec/models/user_spec.rb
spec/models/user_spec.rb
+0
-4
spec/support/stubbed_repository.rb
spec/support/stubbed_repository.rb
+1
-3
No files found.
app/models/event.rb
View file @
40a956eb
...
...
@@ -15,9 +15,6 @@
#
class
Event
<
ActiveRecord
::
Base
include
NoteEvent
include
PushEvent
attr_accessible
:project
,
:action
,
:data
,
:author_id
,
:project_id
,
:target_id
,
:target_type
...
...
app/models/merge_request.rb
View file @
40a956eb
...
...
@@ -20,7 +20,7 @@
#
require
Rails
.
root
.
join
(
"app/models/commit"
)
require
Rails
.
root
.
join
(
"
app/roles
/static_model"
)
require
Rails
.
root
.
join
(
"
lib
/static_model"
)
class
MergeRequest
<
ActiveRecord
::
Base
include
IssueCommonality
...
...
spec/models/project_spec.rb
View file @
40a956eb
...
...
@@ -133,14 +133,6 @@
it
{
should
respond_to
(
:path_with_namespace
)
}
end
describe
'modules'
do
it
{
should
include_module
(
Repository
)
}
it
{
should
include_module
(
PushObserver
)
}
it
{
should
include_module
(
Authority
)
}
it
{
should
include_module
(
Team
)
}
it
{
should
include_module
(
NamespacedProject
)
}
end
it
"should return valid url to repo"
do
project
=
Project
.
new
(
path:
"somewhere"
)
project
.
url_to_repo
.
should
==
Gitlab
.
config
.
gitolite
.
ssh_path_prefix
+
"somewhere.git"
...
...
spec/models/user_spec.rb
View file @
40a956eb
...
...
@@ -65,10 +65,6 @@
it
{
should
ensure_length_of
(
:bio
).
is_within
(
0
..
255
)
}
end
describe
'modules'
do
it
{
should
include_module
(
Account
)
}
end
describe
"Respond to"
do
it
{
should
respond_to
(
:is_admin?
)
}
it
{
should
respond_to
(
:identifier
)
}
...
...
spec/support/stubbed_repository.rb
View file @
40a956eb
# Stubs out all Git repository access done by models so that specs can run
# against fake repositories without Grit complaining that they don't exist.
module
StubbedRepository
class
Project
def
path_to_repo
if
new_record?
||
path
==
'newproject'
# There are a couple Project specs and features that expect the Project's
...
...
@@ -27,5 +27,3 @@ def create
end
end
end
Project
.
send
(
:include
,
StubbedRepository
)
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