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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	VERSION
	app/controllers/omniauth_callbacks_controller.rb
	app/helpers/application_helper.rb
	app/helpers/merge_requests_helper.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_team.rb
	app/views/admin/groups/edit.html.haml
	app/views/groups/_projects.html.haml
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/integration/README.md
	lib/gitlab/git_access.rb
	lib/gitlab/markdown.rb
	spec/helpers/merge_requests_helper.rb
	spec/models/merge_request_spec.rb

2014-06-17 10:53:44 +03:00

..

controllers

Need txt file in test.

2014-05-26 15:58:03 +02:00

factories

Use last appearance settings. Show last edit date

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

features

Remove failing test on travis+pg

2014-06-14 19:41:32 +03:00

finders

Serialize last_fetched_at as a string with seconds

2014-04-28 12:42:01 +02:00

fixtures

Implements drag and drop upload in creating issues

2014-05-23 16:22:42 +08:00

helpers

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

2014-06-17 10:53:44 +03:00

javascripts

Update jasmine gem to work with rails4

2013-12-10 16:03:24 +02:00

lib

Return JiraIssues in ReferenceExtractor#issues_for

2014-06-13 15:40:21 +02:00

mailers

Provide better email subject lines from email on push service

2014-06-15 09:53:00 -05:00

models

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

2014-06-17 10:53:44 +03:00

observers

Fix user_project observer test.

2014-04-03 16:35:33 +02:00

requests/api

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

2014-06-17 10:53:44 +03:00

routing

Delete wall notes tests

2014-06-13 14:29:26 +03:00

services

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

2014-06-17 10:53:44 +03:00

support

DB cleaner reverted to a known working version

2014-06-07 10:09:56 +02:00

tasks/gitlab

Make backup version blocker test more robust

2014-02-28 12:11:43 +01:00

workers

Merge branch 'improve/mr_diff'

2014-01-23 14:38:23 +02:00

factories_spec.rb

Style changes from review with @randx

2013-07-17 22:48:03 -04:00

factories.rb

Implements drag and drop upload in creating issues

2014-05-23 16:22:42 +08:00

seed_project.tar.gz

Speed up features/notes_on_merge_requests_spec

2014-03-19 03:57:37 -04:00

spec_helper.rb

Disable fixtures

2014-06-06 19:55:49 +02:00