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

Conflicts:
	Gemfile.lock
	app/controllers/admin/application_settings_controller.rb
	app/controllers/groups/application_controller.rb
	app/controllers/groups/group_members_controller.rb
	app/controllers/projects/team_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/helpers/projects_helper.rb
	app/helpers/tab_helper.rb
	app/models/application_setting.rb
	app/models/user.rb
	app/views/devise/shared/_signin_box.html.haml
	app/views/groups/projects.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/projects/team_members/_form.html.haml
	app/views/projects/team_members/index.html.haml
	config/routes.rb
	db/schema.rb
	spec/lib/gitlab/ldap/access_spec.rb

2015-03-16 21:25:00 -07: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

Update branch api not found messages to 'Branch not found'.

2014-12-30 13:37:14 +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-03-03 13:33:40 -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

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-02-18 17:44:29 -08:00

helpers.rb

Merge branch 'master' into fix-restricted-visibility

2015-03-14 10:49:11 -06:00

internal.rb

Don't leak information about private project existence via Git-over-SSH/HTTP.

2015-03-02 17:52:48 +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 and improve sorting objects in API for projects, issues and merge requests

2015-02-05 22:00:54 -08: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 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-16 21:25:00 -07: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

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

2015-03-02 16:10:12 -08:00