Valery Sizov 3fcd75a911 Merge CE master into EE master ...

Conflicts:
	Gemfile
	VERSION
	app/assets/javascripts/project.js.coffee
	app/assets/javascripts/users_select.js.coffee
	app/controllers/projects/services_controller.rb
	app/models/project.rb
	app/views/groups/edit.html.haml
	features/project/service.feature
	features/steps/project/services.rb
	spec/models/concerns/mentionable_spec.rb

2014-11-13 17:05:12 +02:00

..

api.rb

Merge branch '7-4-stable-ee' into ee_master

2014-11-11 11:35:18 +02:00

branches.rb

API delete branch: render branch name json instead of true

2014-10-30 17:28:59 +02:00

commits.rb

Adds comments to commits in the API

2014-09-26 10:58:11 +02:00

deploy_keys.rb

Improve error reporting on users API

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

entities.rb

Merge CE master into EE master

2014-11-13 17:05:12 +02:00

files.rb

Use :message key, not :error for File::Service.

2014-10-21 11:37:15 +03:00

group_members.rb

Dont allow guests..developers to manage group members

2014-10-29 16:00:55 +02:00

groups.rb

Merge branch '7-4-stable-ee' into 7-4-stable_non_conflict

2014-10-29 16:13:36 +02:00

helpers.rb

add gitlab-shell identification

2014-10-15 20:03:25 +03:00

internal.rb

add gitlab-shell identification

2014-10-15 20:03:25 +03:00

issues.rb

Filters issues by milestone via API

2014-09-26 22:03:37 +02:00

labels.rb

Improve error reporting on users API

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

ldap.rb

Remove duplicated comment

2014-10-15 22:42:51 +02:00

merge_requests.rb

Merge branch 'api/improve-error-reporting' of https://github.com/jubianchi/gitlabhq into jubianchi-api/improve-error-reporting

2014-09-23 21:35:45 +03:00

milestones.rb

Replace milestone observer with services

2014-06-10 18:07:52 +03:00

namespaces.rb

fix most of warnings

2013-12-15 00:05:10 +04:00

notes.rb

Fix notes creation via API

2014-06-18 09:26:04 +03: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 tag_push_events to project hook api

2014-10-03 10:23:32 +04:00

project_members.rb

More fixes to project members api

2014-09-15 12:01:45 +03:00

project_snippets.rb

Improve error reporting on users API

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

projects.rb

Merge CE master into EE master

2014-11-13 17:05:12 +02:00

repositories.rb

Create RepoTag Grape entity and present it when doing stuff with tags via API. Update API doc for repositories. Add tag message to tag list page in UI. Update Changelog. Update spec to set .gitconfig identity, required for annotated tags.

2014-10-30 09:48:23 -04: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

Refactor API classes. So api classes like Gitlab::Issues become API::Issues

2013-05-14 15:33:31 +03:00

users.rb

Merge branch 'ee-7-4' into 'master'

2014-10-03 12:29:35 +00:00