Douwe Maan f032b15dcf Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee ...

# Conflicts:
#	README.md
#	app/controllers/projects_controller.rb
#	db/schema.rb
#	doc/workflow/README.md
#	lib/gitlab/satellite/merge_action.rb

2015-07-23 13:40:31 +02:00

..

controllers

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

2015-07-23 13:40:31 +02:00

factories

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

2015-07-02 17:07:02 +02:00

features

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

2015-07-23 13:40:31 +02:00

finders

Fix Rubocop warnings

2015-07-02 11:53:53 -04:00

fixtures

GoogleCode importer: Do not care about casing of image file extensions

2015-07-20 00:53:43 +02:00

helpers

Approvers: UI for project settings

2015-07-17 17:58:33 +03:00

javascripts

Add test case for clicking line number anchor icon

2015-07-17 20:40:56 -04:00

lib

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

2015-07-23 13:40:31 +02:00

mailers

RSpec 3 updates for EE

2015-07-02 12:35:49 -04:00

models

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

2015-07-23 13:40:31 +02:00

requests/api

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

2015-07-23 13:40:31 +02:00

routing

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

2015-07-14 15:40:46 +02:00

services

Rename reset_approvers checkbox

2015-07-19 12:35:20 +03:00

support

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

2015-07-23 13:40:31 +02:00

tasks/gitlab

Fix rubocop issues after merge of recent master

2015-06-23 10:46:29 +02:00

workers

Fix Rubocop warnings

2015-07-02 11:53:53 -04: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-07-14 15:40:46 +02:00

rails_helper.rb

Started on the actual rspec 3 upgrade

2015-06-22 12:12:49 +02:00

spec_helper.rb

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

2015-07-14 15:40:46 +02:00

teaspoon_env.rb

teaspoon install

2015-05-28 18:22:32 -04:00