Alfredo Sumaran fe276d0d75 Merge branch 'master' into issue_14678 ...

# Conflicts:
#	app/assets/javascripts/todos.js.coffee

2016-04-11 15:24:59 -05:00

..

config

Don't load all of GitLab in mail_room

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

controllers

Merge branch 'issue_14012' into 'master'

2016-04-07 15:19:56 +00:00

factories

Reload forked_project_link projects

2016-04-04 21:05:51 +02:00

features

Merge branch 'master' into issue_14678

2016-04-11 15:24:59 -05: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

Merge branch 'rs-form_errors' into 'master'

2016-04-11 12:01:50 +00:00

initializers

Ensure Gravatar host looks like an actual host

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

javascripts

Merge branch 'close-issue-bug' into 'master'

2016-04-05 20:48:00 +00:00

lib

Fixed stubbing for Gitlab::Metrics specs

2016-04-11 14:29:38 +02:00

mailers

Premailer shouldn't remove script tags from our emails

2016-04-05 17:03:34 -04:00

models

Expire caches after project creation to ensure a consistent state

2016-04-07 00:29:01 -07:00

requests

Merge branch 'api-filter-milestone' into 'master'

2016-04-07 08:45:35 +00:00

routing

Remove Profile::KeysController#new action

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

services

Only update main language if it is not already set

2016-04-06 14:56:40 -05:00

support

Merge branch 'patch/fix-markdown-preview-wikis' into 'master'

2016-04-07 00:17:21 +00: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