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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
8dd67277
Commit
8dd67277
authored
Jan 07, 2015
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix failing tests due to updates on the return messages.
parent
cd0aed3d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
10 deletions
+10
-10
lib/api/deploy_keys.rb
lib/api/deploy_keys.rb
+1
-1
lib/api/issues.rb
lib/api/issues.rb
+4
-4
lib/api/labels.rb
lib/api/labels.rb
+2
-2
lib/api/merge_requests.rb
lib/api/merge_requests.rb
+1
-1
spec/requests/api/groups_spec.rb
spec/requests/api/groups_spec.rb
+2
-2
No files found.
lib/api/deploy_keys.rb
View file @
8dd67277
...
@@ -58,7 +58,7 @@ module API
...
@@ -58,7 +58,7 @@ module API
if
key
.
valid?
&&
user_project
.
deploy_keys
<<
key
if
key
.
valid?
&&
user_project
.
deploy_keys
<<
key
present
key
,
with:
Entities
::
SSHKey
present
key
,
with:
Entities
::
SSHKey
else
else
render_
api_error!
(
"Failed to add key
#{
key
.
errors
.
messages
}
"
,
400
)
render_
validation_error!
(
key
)
end
end
end
end
...
...
lib/api/issues.rb
View file @
8dd67277
...
@@ -104,7 +104,7 @@ module API
...
@@ -104,7 +104,7 @@ module API
# Validate label names in advance
# Validate label names in advance
if
(
errors
=
validate_label_params
(
params
)).
any?
if
(
errors
=
validate_label_params
(
params
)).
any?
render_api_error!
(
"Unable to validate label:
#{
errors
}
"
},
400
)
render_api_error!
(
{
labels:
errors
},
400
)
end
end
issue
=
::
Issues
::
CreateService
.
new
(
user_project
,
current_user
,
attrs
).
execute
issue
=
::
Issues
::
CreateService
.
new
(
user_project
,
current_user
,
attrs
).
execute
...
@@ -118,7 +118,7 @@ module API
...
@@ -118,7 +118,7 @@ module API
present
issue
,
with:
Entities
::
Issue
present
issue
,
with:
Entities
::
Issue
else
else
render_
api_error!
(
"Unable to create issue
#{
issue
.
errors
.
messages
}
"
,
400
)
render_
validation_error!
(
issue
)
end
end
end
end
...
@@ -142,7 +142,7 @@ module API
...
@@ -142,7 +142,7 @@ module API
# Validate label names in advance
# Validate label names in advance
if
(
errors
=
validate_label_params
(
params
)).
any?
if
(
errors
=
validate_label_params
(
params
)).
any?
render_api_error!
(
"Unable to validate label:
#{
errors
}
"
},
400
)
render_api_error!
(
{
labels:
errors
},
400
)
end
end
issue
=
::
Issues
::
UpdateService
.
new
(
user_project
,
current_user
,
attrs
).
execute
(
issue
)
issue
=
::
Issues
::
UpdateService
.
new
(
user_project
,
current_user
,
attrs
).
execute
(
issue
)
...
@@ -158,7 +158,7 @@ module API
...
@@ -158,7 +158,7 @@ module API
present
issue
,
with:
Entities
::
Issue
present
issue
,
with:
Entities
::
Issue
else
else
render_
api_error!
(
"Unable to update issue
#{
issue
.
errors
.
messages
}
"
,
400
)
render_
validation_error!
(
issue
)
end
end
end
end
...
...
lib/api/labels.rb
View file @
8dd67277
...
@@ -37,7 +37,7 @@ module API
...
@@ -37,7 +37,7 @@ module API
if
label
.
valid?
if
label
.
valid?
present
label
,
with:
Entities
::
Label
present
label
,
with:
Entities
::
Label
else
else
render_
api_error!
(
"Unable to create label
#{
label
.
errors
.
messages
}
"
,
400
)
render_
validation_error!
(
label
)
end
end
end
end
...
@@ -90,7 +90,7 @@ module API
...
@@ -90,7 +90,7 @@ module API
if
label
.
update
(
attrs
)
if
label
.
update
(
attrs
)
present
label
,
with:
Entities
::
Label
present
label
,
with:
Entities
::
Label
else
else
render_
api_error!
(
"Unable to create label
#{
label
.
errors
.
messages
}
"
,
400
)
render_
validation_error!
(
label
)
end
end
end
end
end
end
...
...
lib/api/merge_requests.rb
View file @
8dd67277
...
@@ -137,7 +137,7 @@ module API
...
@@ -137,7 +137,7 @@ module API
# Validate label names in advance
# Validate label names in advance
if
(
errors
=
validate_label_params
(
params
)).
any?
if
(
errors
=
validate_label_params
(
params
)).
any?
render_api_error!
(
"Unable to validate label:
#{
errors
}
"
},
400
)
render_api_error!
(
{
labels:
errors
},
400
)
end
end
merge_request
=
::
MergeRequests
::
UpdateService
.
new
(
user_project
,
current_user
,
attrs
).
execute
(
merge_request
)
merge_request
=
::
MergeRequests
::
UpdateService
.
new
(
user_project
,
current_user
,
attrs
).
execute
(
merge_request
)
...
...
spec/requests/api/groups_spec.rb
View file @
8dd67277
...
@@ -91,8 +91,8 @@ describe API::API, api: true do
...
@@ -91,8 +91,8 @@ describe API::API, api: true do
it
"should not create group, duplicate"
do
it
"should not create group, duplicate"
do
post
api
(
"/groups"
,
admin
),
{
name:
"Duplicate Test"
,
path:
group2
.
path
}
post
api
(
"/groups"
,
admin
),
{
name:
"Duplicate Test"
,
path:
group2
.
path
}
response
.
status
.
should
==
4
22
response
.
status
.
should
==
4
00
response
.
message
.
should
==
"
Unprocessable Entity
"
response
.
message
.
should
==
"
Bad Request
"
end
end
it
"should return 400 bad request error if name not given"
do
it
"should return 400 bad request error if name not given"
do
...
...
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