Dmitriy Zaporozhets c84b14d2a1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ...

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/autocomplete_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/services_controller.rb
	app/helpers/projects_helper.rb
	app/services/audit_event_service.rb
	db/schema.rb
	doc/api/users.md
	doc/update/6.x-or-7.x-to-7.13.md
	features/project/project.feature

2015-07-14 15:40:46 +02:00

..

api_guard.rb

Rubocop: Style/CaseIndentation enabled

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

api.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-07-14 15:40:46 +02:00

branches.rb

Added the missing comma

2015-03-31 17:08:33 +01:00

commits.rb

Order commit comments in API chronologically

2015-05-08 14:34:10 +02:00

deploy_keys.rb

Fix failing tests due to updates on the return messages.

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

entities.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-07-14 15:40:46 +02:00

files.rb

Fix editing files via API

2015-06-05 17:16:51 +02:00

group_members.rb

Track who created a group or project member.

2015-04-14 12:06:42 +02:00

groups.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-07-14 15:40:46 +02:00

helpers.rb

Allow to configure gitlab_shell_secret location

2015-05-16 21:46:06 +02:00

internal.rb

Improve Git access error messages.

2015-05-13 09:41:55 +02:00

issues.rb

Merge branch 'rename-abilities' into 'master'

2015-06-26 16:39:17 +00:00

labels.rb

Fix failing tests due to updates on the return messages.

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

ldap_group_links.rb

Add API support for adding and removing LDAP group links

2015-05-26 19:30:48 +02:00

ldap.rb

Escape wildcards when searching LDAP by group name.

2015-03-06 13:40:45 +01:00

merge_requests.rb

Rename abilities to correspond contoller/model action names

2015-06-26 15:55:56 +02: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

Make namespace API available to all users

2015-05-28 11:39:12 -07:00

notes.rb

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

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

project_git_hook.rb

Name the class singular, fix the failing spec.

2014-11-03 14:48:57 +01:00

project_hooks.rb

Add support for Webhook note events

2015-05-21 23:48:16 -04:00

project_members.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-16 21:25:00 -07:00

project_snippets.rb

Rename abilities to correspond contoller/model action names

2015-06-26 15:55:56 +02:00

projects.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-05-15 13:29:58 +03:00

repositories.rb

Use project.commit convenience method.

2015-04-24 12:29:36 +02: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

settings.rb

Add tests and improve logic

2015-07-06 16:47:19 +02:00

system_hooks.rb

Added X-GitLab-Event header for web hooks

2015-05-08 16:49:03 +03:00

users.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-07-14 15:40:46 +02:00