Dmitriy Zaporozhets 976e18bb33 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 7-9-pre ...

Conflicts:
	app/views/groups/show.html.haml
	app/views/projects/team_members/index.html.haml
	config/routes.rb

2015-02-23 23:56:59 -08:00

..

controllers

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 7-9-pre

2015-02-23 23:56:59 -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

Merge branch 'master' into rails-4.1.9

2015-02-19 20:53:05 -07: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 into 7-9-pre

2015-02-23 23:56:59 -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 into 7-9-pre

2015-02-23 23:56:59 -08:00

mailers

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 7-9-pre

2015-02-23 23:56:59 -08:00

models

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 7-9-pre

2015-02-23 23:56:59 -08:00

requests/api

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 7-9-pre

2015-02-23 23:56:59 -08:00

routing

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 7-9-pre

2015-02-23 23:56:59 -08:00

services

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 7-9-pre

2015-02-23 23:56:59 -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