Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
213c28298d39
Commit
213c2829
authored
Feb 11, 2013
by
Andrew8xx8
Browse files
New field added
parent
b84531a1e1ec
Changes
6
Hide whitespace changes
Inline
Side-by-side
app/models/project.rb
View file @
213c2829
...
...
@@ -28,7 +28,7 @@
class
TransferError
<
StandardError
;
end
attr_accessible
:name
,
:path
,
:description
,
:default_branch
,
:issues_tracker
,
:issues_enabled
,
:wall_enabled
,
:merge_requests_enabled
,
:issues_enabled
,
:wall_enabled
,
:merge_requests_enabled
,
:issues_tracker_id
,
:wiki_enabled
,
:public
,
:import_url
,
as:
[
:default
,
:admin
]
attr_accessible
:namespace_id
,
:creator_id
,
as: :admin
...
...
@@ -74,6 +74,7 @@
message:
"only letters, digits & '_' '-' '.' allowed. Letter should be first"
}
validates
:issues_enabled
,
:wall_enabled
,
:merge_requests_enabled
,
:wiki_enabled
,
inclusion:
{
in:
[
true
,
false
]
}
validates
:issues_tracker_id
,
length:
{
within:
0
..
255
}
validates_uniqueness_of
:name
,
scope: :namespace_id
validates_uniqueness_of
:path
,
scope: :namespace_id
...
...
@@ -217,6 +218,10 @@
self
.
issues_tracker
==
Project
.
issues_tracker
.
default_value
end
def
can_have_issues_tracker_id?
self
.
issues_enabled
&&
!
self
.
used_default_issues_tracker?
end
def
services
[
gitlab_ci_service
].
compact
end
...
...
app/views/admin/projects/_form.html.haml
View file @
213c2829
...
...
@@ -36,6 +36,10 @@
.input
=
f
.
select
(
:issues_tracker
,
Project
.
issues_tracker
.
values
,
{},
{
disabled:
!
@project
.
issues_enabled
})
.clearfix
=
f
.
label
:issues_tracker_id
,
"Project name or id in issues tracker"
,
class:
'control-label'
.input
=
f
.
text_field
:issues_tracker_id
,
class:
"xxlarge"
,
disabled:
!
@project
.
can_have_issues_tracker_id?
.clearfix
=
f
.
label
:merge_requests_enabled
,
"Merge Requests"
.input
=
f
.
check_box
:merge_requests_enabled
...
...
app/views/projects/_form.html.haml
View file @
213c2829
...
...
@@ -28,6 +28,10 @@
=
f
.
label
:issues_tracker
,
"Issues tracker"
,
class:
'control-label'
.input
=
f
.
select
(
:issues_tracker
,
Project
.
issues_tracker
.
values
,
{},
{
disabled:
!
@project
.
issues_enabled
})
.clearfix
=
f
.
label
:issues_tracker_id
,
"Project name or id in issues tracker"
,
class:
'control-label'
.input
=
f
.
text_field
:issues_tracker_id
,
class:
"xxlarge"
,
disabled:
!
@project
.
can_have_issues_tracker_id?
.control-group
=
f
.
label
:merge_requests_enabled
,
"Merge Requests"
,
class:
'control-label'
.controls
...
...
config/gitlab.yml.example
View file @
213c2829
...
...
@@ -7,8 +7,6 @@
# 2. Replace gitlab -> host with your domain
# 3. Replace gitlab -> email_from
<<<<<<< HEAD
<<<<<<< HEAD
production: &base
#
# 1. GitLab app settings
...
...
@@ -43,9 +41,7 @@
## External issues trackers
issues_tracker:
redmine:
## If not nil Issues link in project page will be replaced to this
url: "http://redmine.sample"
## If not nil links from /#\d/ entities from commit messages will replaced to this
## If not nil, links from /#\d/ entities from commit messages will replaced to this
## Use placeholders:
## :project_id - Gitlab project identifier
## :issues_tracker_id - Project Name or Id in external issue tracker
...
...
spec/factories.rb
View file @
213c2829
...
...
@@ -31,6 +31,7 @@
factory
:redmine_project
,
parent: :project
do
issues_tracker
{
"redmine"
}
issues_tracker_id
{
"project_name_in_redmine"
}
end
factory
:group
do
...
...
spec/models/project_spec.rb
View file @
213c2829
...
...
@@ -60,6 +60,7 @@
it
{
should
ensure_inclusion_of
(
:wall_enabled
).
in_array
([
true
,
false
])
}
it
{
should
ensure_inclusion_of
(
:merge_requests_enabled
).
in_array
([
true
,
false
])
}
it
{
should
ensure_inclusion_of
(
:wiki_enabled
).
in_array
([
true
,
false
])
}
it
{
should
ensure_length_of
(
:issues_tracker_id
).
is_within
(
0
..
255
)
}
it
"should not allow new projects beyond user limits"
do
project
.
stub
(
:creator
).
and_return
(
double
(
can_create_project?:
false
,
projects_limit:
1
))
...
...
@@ -223,4 +224,24 @@
end
end
describe
:can_have_issues_tracker_id?
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:ext_project
)
{
create
(
:redmine_project
)
}
it
"should be true for projects with external issues tracker if issues enabled"
do
ext_project
.
can_have_issues_tracker_id?
.
should
be_true
end
it
"should be false for projects with internal issue tracker if issues enabled"
do
project
.
can_have_issues_tracker_id?
.
should
be_false
end
it
"should be always false if issues disbled"
do
project
.
issues_enabled
=
false
ext_project
.
issues_enabled
=
false
project
.
can_have_issues_tracker_id?
.
should
be_false
ext_project
.
can_have_issues_tracker_id?
.
should
be_false
end
end
end
Write
Preview
Supports
Markdown
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