Douwe Maan ba7fcc9866 Merge branch 'update_repository_from_ee' into 'master' ...

Migrate Repository#local_branches from gitlab-ee.

REF: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/249

This will help us to avoid posible merge conflicts when merging
gitlab-ce to gitlab-ee

See merge request !3496

2016-04-04 14:25:15 +00:00

..

config

Don't load all of GitLab in mail_room

2016-02-26 18:48:13 -08:00

controllers

Minor clean up on admin/users_controller_spec

2016-03-31 22:29:32 +02:00

factories

Extend specs for GFM uploads rewriter

2016-03-31 09:43:47 +02:00

features

Fix creation of merge requests for orphaned branches

2016-04-04 04:51:05 -07:00

finders

Fix specs

2016-03-22 00:23:58 +01:00

fixtures

Improve and finish the fallback to the In-Reply-To and References header for the reply-by-email feature

2016-03-25 13:05:15 +01:00

helpers

Implementing 'Groups View' and 'TODOs View' as options for dashboard preferences.

2016-03-24 19:59:54 +01:00

initializers

Ensure Gravatar host looks like an actual host

2016-01-18 14:58:16 +01:00

javascripts

Change js-quick-submit behavior to expect the class on the form

2016-03-02 15:11:15 -05:00

lib

Merge branch 'routing' into 'master'

2016-04-01 16:51:20 +00:00

mailers

Improve and finish the fallback to the In-Reply-To and References header for the reply-by-email feature

2016-03-25 13:05:15 +01:00

models

Migrate Repository#local_branches from gitlab-ee.

2016-04-01 14:21:08 -05:00

requests

Merge branch 'add-ability-to-archive-a-project-via-api-14296' into 'master'

2016-04-03 13:19:25 +00:00

routing

Remove Profile::KeysController#new action

2016-03-03 16:13:59 -05:00

services

Merge branch 'fix-mentions-on-confidential-issues-for-non-members' into 'master'

2016-04-01 08:36:20 +00:00

support

Fix creation of merge requests for orphaned branches

2016-04-04 04:51:05 -07:00

tasks/gitlab

Ensure uploads dir exists when running backup specs

2016-03-30 15:40:49 +02:00

views

Move "I should see Crowd login form" feature to a view spec

2016-02-24 17:38:13 -05:00

workers

Migrate Repository#local_branches from gitlab-ee.

2016-04-01 14:21:08 -05:00

factories_spec.rb

Add support for not Active Record based factories

2016-03-30 10:44:18 +02:00

rails_helper.rb

Started on the actual rspec 3 upgrade

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

spec_helper.rb

Move CarrierWave test env config to separate file

2016-03-30 13:57:01 +02:00

teaspoon_env.rb

teaspoon install

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