Dmitriy Zaporozhets b2fb6e0e0c Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq ...

Conflicts:
	app/services/merge_requests/build_service.rb
	app/views/layouts/_head.html.haml

2015-02-20 16:02:25 -08:00

..

controllers

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-02-20 16:02:25 -08:00

factories

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

2015-02-04 18:19:22 -08:00

features

Make sure Markdown previews always use the same styling as the eventual destination.

2015-02-17 17:58:08 +01:00

finders

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

2015-02-16 11:50:30 -08:00

fixtures

Add trailing newline to all text files.

2014-06-21 11:20:22 +02:00

helpers

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-02-18 17:44:29 -08:00

javascripts

Add trailing newline to all text files.

2014-06-21 11:20:22 +02:00

lib

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-02-20 16:02:25 -08:00

mailers

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

2015-02-16 11:50:30 -08:00

models

Update spec per rspec 2.99 requirements.

2015-02-16 13:11:39 -08:00

requests/api

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-02-18 17:44:29 -08:00

routing

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

2015-02-16 11:50:30 -08:00

services

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

2015-02-16 11:50:30 -08:00

support

TestEnv improvements

2015-02-16 20:36:34 -05:00

tasks/gitlab

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

workers

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

2015-02-16 11:50:30 -08:00

factories_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

factories.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

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

spec_helper.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00