Dmitriy Zaporozhets e64343d6e1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-changes ...

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

Conflicts:
	VERSION
	app/views/layouts/devise.html.haml
	features/project/project.feature
	features/steps/project/project.rb

2014-06-26 13:02:08 +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 rails observers from application

2014-06-17 22:51:43 +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-changes

2014-06-26 13:02:08 +03:00

javascripts

Update jasmine gem to work with rails4

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

lib

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-changes

2014-06-26 13:02:08 +03:00

mailers

Revert "Merge branch 'fix-email-threading' into 'master'"

2014-06-18 13:41:12 +02:00

models

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-changes

2014-06-26 13:02:08 +03:00

requests/api

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-changes

2014-06-26 13:02:08 +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-changes

2014-06-26 13:02:08 +03:00

support

Remove rails observers from application

2014-06-17 22:51:43 +03: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

Remove rails observers from application

2014-06-17 22:51:43 +03:00