James Lopez 3929972d90 Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental ...

# Conflicts:
#	app/controllers/import/gitlab_project_controller.rb

2016-05-03 13:14:31 +02:00

..

config

Don't load all of GitLab in mail_room

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

controllers

Merge remote-tracking branch 'dev/master' into 'master'

2016-05-02 19:58:54 -04:00

factories

Backported minimal safewebhook implementation to GitLab CE

2016-04-30 05:04:10 -03:00

features

Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental

2016-05-03 13:14:31 +02:00

finders

Return unique issues when using multiple labels

2016-04-13 16:10:49 -04: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

Merge remote-tracking branch 'dev/master' into 'master'

2016-05-02 19:58:54 -04:00

initializers

Ensure Gravatar host looks like an actual host

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

javascripts

Placeholder on milestone form

2016-04-14 10:28:05 +01:00

lib

Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import

2016-05-03 13:07:16 +02:00

mailers

Merge branch 'mr-formatting' into 'master'

2016-04-19 16:23:41 +00:00

models

Merge remote-tracking branch 'dev/master' into 'master'

2016-05-02 19:58:54 -04:00

requests

Prevent privilege escalation via notes API

2016-04-26 14:40:51 -04:00

routing

Remove Profile::KeysController#new action

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

services

Support e-mail notifications for comments on project snippets

2016-05-02 11:01:32 -07:00

support

Merge branches 'feature/project-export' and 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export

2016-05-03 11:15:38 +02: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

Do not fsck projects less than a day old

2016-04-26 13:35:52 +02: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