Dmitriy Zaporozhets d41b2085fe Merge branch 'master' into 'master' ...

Change ordering so that confirm is removed from attrs before attempting to User.build_user

Possible fix gitlab-org/gitlab-ce#1296

See merge request !445

2015-03-26 01:14:54 +00:00

..

api_guard.rb

Rubocop: Style/CaseIndentation enabled

2015-02-02 21:26:40 -08:00

api.rb

Rubocop enabled for: Use spaces inside hash literal braces

2015-02-02 20:36:54 -08:00

branches.rb

Unescape branch param to delete

2015-03-24 13:04:22 +00:00

commits.rb

Add a message when unable to save an object through api.

2015-01-07 10:46:00 +01:00

deploy_keys.rb

Fix failing tests due to updates on the return messages.

2015-01-07 11:39:20 +01:00

entities.rb

Enable ParenthesesAsGroupedExpression rule

2015-03-02 18:45:28 -08:00

files.rb

Improve error messages when file editing fails

2015-02-22 16:01:49 -07:00

group_members.rb

Use group_member instead of users_group or membership.

2015-03-15 13:49:41 +01:00

groups.rb

Remove Group#owner_id from API since it is not used any more

2015-02-17 16:23:44 -08:00

helpers.rb

Enable more rubocop style checks

2015-03-24 18:28:10 -07:00

internal.rb

Respond with full GitAccess error if user has project read access.

2015-03-24 14:12:03 +01:00

issues.rb

Refactor and improve sorting objects in API for projects, issues and merge requests

2015-02-05 22:00:54 -08:00

labels.rb

Fix failing tests due to updates on the return messages.

2015-01-07 11:39:20 +01:00

merge_requests.rb

Refactor GitAccess to use instance variables.

2015-03-24 14:11:48 +01:00

milestones.rb

Fix the test and add documentation for the "per-milestone issues API call"

2015-01-22 12:14:53 +01:00

namespaces.rb

Avoid using {...} for multi-line blocks

2015-02-02 21:22:57 -08:00

notes.rb

Add a message when unable to save an object through api.

2015-01-07 10:46:00 +01:00

project_hooks.rb

Forward the messages in api response.

2014-12-30 15:17:46 +01:00

project_members.rb

Use project_member instead of team_member.

2015-03-15 13:50:38 +01:00

project_snippets.rb

More restricted visibility changes

2015-03-10 18:36:43 -06:00

projects.rb

Allow admins to override restricted visibility

2015-03-08 16:10:05 -06:00

repositories.rb

Handle errors on API when a project does not have a repository (Closes #6289)

2015-01-19 14:13:30 +01:00

services.rb

Add Hipchat services API

2014-10-14 19:07:34 +02:00

session.rb

Add LDAP support to /api/session

2013-07-16 11:28:19 +03:00

system_hooks.rb

Avoid using {...} for multi-line blocks

2015-02-02 21:22:57 -08:00

users.rb

Change ordering so that confirm is removed from attrs before attempting to User.build_user

2015-03-24 15:52:26 +00:00