Douwe Maan 68ac20604b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee ...

# Conflicts:
#	app/controllers/groups/application_controller.rb
#	app/services/test_hook_service.rb
#	app/views/admin/groups/show.html.haml
#	app/views/groups/_settings_nav.html.haml
#	app/views/groups/show.html.haml
#	app/views/layouts/_head.html.haml
#	app/views/projects/_settings_nav.html.haml
#	db/schema.rb
#	features/project/project.feature
#	features/steps/project/project.rb

2015-05-05 10:18:27 +02:00

..

api_guard.rb

Rubocop: Style/CaseIndentation enabled

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

api.rb

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

2015-05-05 10:18:27 +02:00

branches.rb

Added the missing comma

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

commits.rb

Use project.commit convenience method.

2015-04-24 12:29:36 +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 gitlab.com:gitlab-org/gitlab-ce into ce-to-ee

2015-05-05 10:18:27 +02:00

files.rb

Use project.commit convenience method.

2015-04-24 12:29:36 +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 gitlab.com:gitlab-org/gitlab-ce into ce-to-ee

2015-05-05 10:18:27 +02:00

helpers.rb

Query issues, merge requests and milestones with their IID through API

2015-05-02 10:44:52 +02:00

internal.rb

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

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

issues.rb

Query issues, merge requests and milestones with their IID through API

2015-05-02 10:44:52 +02: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

Query issues, merge requests and milestones with their IID through API

2015-05-02 10:44:52 +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

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

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

system_hooks.rb

Revert "Added X-GitLab-Event header for web hooks"

2015-04-27 16:29:31 +03: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