Marin Jankovski 3e875b05b4 Merge remote-tracking branch 'ce/master' into merge_ce ...

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/project_new.js.coffee
	app/controllers/projects_controller.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/project_team.rb
	app/models/user.rb
	app/services/files/create_service.rb
	app/views/layouts/nav/_admin.html.haml
	config/routes.rb
	db/schema.rb
	spec/models/jira_service_spec.rb
	spec/requests/api/projects_spec.rb

2015-01-29 11:34:43 -08:00

..

files

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

2015-01-29 11:34:43 -08:00

issues

Organize event order execution when update issue or mr

2015-01-25 22:49:05 -08:00

merge_requests

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

2015-01-29 11:34:43 -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

Fix various typos

2015-01-18 10:29:37 -05:00

projects

Fix tests, merge conflicts, some minor issues and make the project avatar feature mergable

2015-01-24 18:51:16 +01: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

Fix ci data in hook when create git tag via UI

2015-01-12 00:05:04 -08: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 branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-01-21 17:05:31 -08:00

git_tag_push_service.rb

Refactor push data builder. Moved it to separate class

2015-01-11 23:51:31 -08: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

Add issue/mr participants to reasign events

2015-01-25 20:31:02 -08:00

system_hooks_service.rb

Added support for firing system hooks on group create/destroy and adding/removing users to group.

2015-01-27 09:25:28 +02:00

test_hook_service.rb

Fix test hook and tests

2015-01-12 09:08:25 -08:00