Dmitriy Zaporozhets 3a9682a3d7 Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce ...

Conflicts:
	VERSION
	app/helpers/selects_helper.rb
	app/models/project.rb
	app/views/devise/sessions/new.html.haml
	app/views/groups/_settings_nav.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/profiles/keys/index.html.haml
	app/views/profiles/keys/show.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	config/routes.rb
	db/schema.rb
	doc/api/projects.md
	features/steps/shared/paths.rb

2015-01-08 20:37:35 -08:00

..

files

Merge branch '7-4-stable' into ee_stable

2014-10-21 13:48:16 +03:00

issues

Merge pull request #7967 from Bugagazavr/issue-actor

2014-11-05 12:10:50 +02:00

merge_requests

Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2015-01-08 20:37:35 -08:00

milestones

Merge branch 'group_milestones' into 'master'

2014-07-01 07:18:15 +00:00

notes

Implemented notes (body) patching in API.

2014-12-25 14:28:40 +02:00

oauth2

Doorkeeper integration

2014-12-24 15:38:07 +02:00

projects

For API compatibility still generate path from name if only name provided

2014-12-22 17:09:48 +02:00

search

Adding in snippet search functionality

2014-08-29 15:32:07 -04:00

archive_repository_service.rb

Fix repository archive

2014-08-13 21:28:22 +03:00

audit_event_service.rb

Move event creation to service.

2014-11-21 12:32:12 +01:00

base_service.rb

Improve application settings and write tests

2015-01-08 09:53:35 -08:00

compare_service.rb

Comment typo.

2014-08-29 20:11:57 +02:00

create_branch_service.rb

Factor error and success methods from services.

2014-09-21 11:43:05 +02:00

create_tag_service.rb

Factor error and success methods from services.

2014-09-21 11:43:05 +02:00

delete_branch_service.rb

Factor error and success methods from services.

2014-09-21 11:43:05 +02:00

event_create_service.rb

Use EventCreateService for notes, merge requests

2014-03-25 15:08:25 +02:00

git_push_service.rb

Merge CE master into EE master

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

git_tag_push_service.rb

Create event and clear cache on new trag push

2014-03-13 11:37:13 +02:00

gravatar_service.rb

Improve application settings and write tests

2015-01-08 09:53:35 -08:00

issuable_base_service.rb

Factor issue and merge request services

2014-10-07 21:12:18 +02:00

ldap_group_reset_service.rb

Fix EE code after membership refactoring

2014-10-03 14:09:07 +03:00

notification_service.rb

New feature: add 'Mention' notification level

2014-12-29 15:55:21 +02:00

system_hooks_service.rb

Merge pull request #7495 from polamjag/fix-date-format-on-system-hook

2014-11-05 13:14:26 +02:00

test_hook_service.rb

Handle web hook exception

2014-12-04 15:07:01 +02:00