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

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

Conflicts:
	app/models/project.rb
	db/schema.rb

2015-04-20 19:19:27 +03:00

..

controllers

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

2015-04-20 19:19:27 +03:00

factories

git hook sample: tests

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

features

Re-fix image rendering for help pages

2015-04-15 12:45:31 -04:00

finders

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

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

fixtures

Import Google Code issue assignee when mapped.

2015-04-14 23:22:14 +02:00

helpers

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

2015-04-15 19:22:57 +03: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-04-20 19:19:27 +03:00

mailers

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

2015-04-15 19:22:57 +03:00

models

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

2015-04-15 19:22:57 +03:00

requests/api

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

2015-04-15 19:22:57 +03:00

routing

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

2015-04-20 19:19:27 +03:00

services

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

2015-04-20 19:19:27 +03:00

support

Merge pull request #9044 from tsigo/rs-git-template-env

2015-03-29 03:40:56 -07:00

tasks/gitlab

Merge branch 'fix-backup-spec-regexp' into 'master'

2015-04-03 08:49:47 +00:00

workers

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

2015-04-15 19:22:57 +03:00

factories_spec.rb

Remove the invalid key factories

2015-04-11 17:12:10 -04:00

factories.rb

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

2015-04-15 19:22:57 +03:00

spec_helper.rb

Add ActiveRecord::Migration.maintain_test_schema! to spec_helper

2015-03-27 15:31:16 -04:00