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

Conflicts:
	app/controllers/uploads_controller.rb
	app/helpers/application_helper.rb
	app/models/note.rb
	app/services/test_hook_service.rb
	db/schema.rb
	spec/models/note_spec.rb

2015-05-13 14:10:14 +03:00

..

appearances.rb

Use last appearance settings. Show last edit date

2014-04-14 22:14:51 +03:00

broadcast_messages.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

forked_project_links.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

git_hooks.rb

git hook sample: tests

2015-03-26 13:38:26 +02:00

group_members.rb

Replace project_access attribute with access_level in specs and API

2014-09-15 11:36:50 +03:00

label_links.rb

Annotate models

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

labels.rb

Annotate models

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

merge_requests.rb

Added comment notification events to HipChat and Slack services.

2015-03-06 06:54:00 -08:00

notes.rb

Simplify Note model specs

2015-05-11 00:01:16 -04:00

project_group_links.rb

ProjectGroupLink model with migration and specs

2013-07-11 09:47:46 +03:00

projects.rb

Add jira_project project factory

2015-04-30 16:35:27 -04:00