James Lopez 2a747d386d fixed merge conflicts

2016-06-16 14:07:49 +02:00

..

config

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

controllers

Revert "squashed merge and fixed conflicts"

2016-06-16 12:59:07 +02:00

factories

Revert "squashed merge and fixed conflicts"

2016-06-16 12:59:07 +02:00

features

Revert "squashed merge and fixed conflicts"

2016-06-16 12:59:07 +02:00

finders

Revert "squashed merge and fixed conflicts"

2016-06-16 12:59:07 +02:00

fixtures

Revert "squashed merge and fixed conflicts"

2016-06-16 12:59:07 +02:00

helpers

Revert "squashed merge and fixed conflicts"

2016-06-16 12:59:07 +02:00

initializers

Add tests for setting trusted_proxies

2016-05-04 15:49:39 -07:00

javascripts

Revert "squashed merge and fixed conflicts"

2016-06-16 12:59:07 +02:00

lib

fixed merge conflicts

2016-06-16 14:07:49 +02:00

mailers

Revert "squashed merge and fixed conflicts"

2016-06-16 12:59:07 +02:00

models

Revert "squashed merge and fixed conflicts"

2016-06-16 12:59:07 +02:00

requests

Revert "squashed merge and fixed conflicts"

2016-06-16 12:59:07 +02:00

routing

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

services

Revert "squashed merge and fixed conflicts"

2016-06-16 12:59:07 +02:00

support

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

2016-06-16 13:04:00 +02:00

tasks/gitlab

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

views

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

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

workers

Revert "squashed merge and fixed conflicts"

2016-06-16 12:59:07 +02:00

factories_spec.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

rails_helper.rb

Started on the actual rspec 3 upgrade

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

spec_helper.rb

Enable Knapsack only in CI environment

2016-06-08 11:43:13 +02:00

teaspoon_env.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00