Dmitriy Zaporozhets d01d0c02b7 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/admin/application_settings_controller.rb
	app/controllers/groups/group_members_controller.rb
	app/controllers/projects/deploy_keys_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/project_team.rb
	app/models/service.rb
	app/views/admin/application_settings/_form.html.haml
	app/views/admin/groups/show.html.haml
	app/views/groups/group_members/_new_group_member.html.haml
	config/initializers/1_settings.rb
	db/schema.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/reference_extractor_spec.rb

2015-04-15 19:22:57 +03: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-into-ee

2015-02-04 18:19:22 -08:00

branches.rb

Added the missing comma

2015-03-31 17:08:33 +01: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

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

2015-04-15 19:22:57 +03:00

files.rb

Improve error messages when file editing fails

2015-02-22 16:01:49 -07: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-04-15 19:22:57 +03: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

ldap.rb

Escape wildcards when searching LDAP by group name.

2015-03-06 13:40:45 +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_git_hook.rb

Name the class singular, fix the failing spec.

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

project_hooks.rb

Forward the messages in api response.

2014-12-30 15:17:46 +01: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

More restricted visibility changes

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

projects.rb

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

2015-04-14 15:08:19 +03:00

repositories.rb

Archive repositories in background worker.

2015-03-31 12:52:20 +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

system_hooks.rb

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

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

users.rb

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

2015-04-14 13:05:39 +03:00