James Lopez 0ca2757483 fix merge conflicts

2016-06-28 12:12:08 +02:00

..

config

Revert "Fix merge conflicts - squashed commit"

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

controllers

Use HTTP matchers if possible

2016-06-27 20:10:42 +02:00

factories

Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-project

2016-06-20 14:04:14 +00:00

features

Merge branch '19102-fix' into 'master'

2016-06-27 18:41:31 +00:00

finders

Revert "squashed merge and fixed conflicts"

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

fixtures

Show proper image ID on registry page

2016-06-21 13:08:10 +02:00

helpers

Remove Haml helpers from the visibility level spec.

2016-06-22 16:10:26 -06:00

initializers

Fix settings_spec so that it can that run by itself

2016-06-23 22:26:33 -07:00

javascripts

Merge branch 'emoji-menu-stick-search' into 'master'

2016-06-27 18:03:08 +00:00

lib

support cgi style options, such as erb?parent=json

2016-06-27 14:17:49 -07:00

mailers

Fallback to group's owners/masters when a project has none

2016-06-20 12:10:37 +02:00

models

fix merge conflicts

2016-06-28 12:12:08 +02:00

requests

Rename Licenses API to License Templates API

2016-06-27 14:42:05 -05:00

routing

Revert "Fix merge conflicts - squashed commit"

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

services

Merge branch 'fix-18997' into 'master'

2016-06-27 18:43:12 +00:00

support

support cgi style options, such as erb?parent=json

2016-06-27 14:17:49 -07: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

Unify check branch name exist

2016-06-20 21:44:21 +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