Marin Jankovski 7d9ef1124e Merge remote-tracking branch 'ce/master' into merge_ce ...

Conflicts:
	README.md
	app/assets/javascripts/project.js.coffee
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/service.rb
	app/models/user.rb
	app/services/git_push_service.rb
	config/initializers/1_settings.rb
	config/routes.rb
	db/schema.rb
	doc/integration/README.md
	doc/integration/external-issue-tracker.md
	doc/integration/github.md
	spec/controllers/import/github_controller_spec.rb
	spec/helpers/merge_requests_helper.rb
	spec/lib/gitlab/upgrader_spec.rb
	spec/models/note_spec.rb
	spec/requests/api/groups_spec.rb
	spec/services/git_push_service_spec.rb

2015-02-16 11:50:30 -08: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 remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08:00

files.rb

Message for api files and groups.

2014-12-30 14:29:55 +01:00

group_members.rb

Edit group members via API

2015-02-11 18:53:07 -07:00

groups.rb

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

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

helpers.rb

Edit group members via API

2015-02-11 18:53:07 -07:00

internal.rb

Add internal broadcast message API.

2015-02-07 16:41:30 +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

Remove duplicated comment

2014-10-15 22:42:51 +02: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 remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08:00

project_snippets.rb

Improve error reporting on users API

2014-09-16 01:25:24 +02:00

projects.rb

Merge remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08: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

fix for ldap group integration

2015-02-11 13:02:20 +02:00