James Lopez 7779457907 fix merge

2016-06-14 10:20:47 +02:00

..

config

Revert "Fix merge conflicts - squashed commit"

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

controllers

Merge branch 'master' into workhorse-helpers

2016-06-10 12:28:04 +02:00

factories

Merge branch '18019-fix-wiki-linking' into 'master'

2016-06-09 08:37:27 +00:00

features

Fix preferences_spec test

2016-06-10 15:08:13 -05:00

finders

Revert "Fix merge conflicts - squashed commit"

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

fixtures

Set target="_blank" for external links

2016-06-08 13:07:20 -05:00

helpers

Merge branch '18019-fix-wiki-linking' into 'master'

2016-06-09 08:37:27 +00:00

initializers

Add tests for setting trusted_proxies

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

javascripts

Move award_menu_url variable into gon object.

2016-06-09 03:37:40 +03:00

lib

fix merge

2016-06-14 10:20:47 +02:00

mailers

Revert "Fix merge conflicts - squashed commit"

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

models

Merge branch 'finding-multiple-projects-by-paths' into 'master'

2016-06-10 17:17:19 +00:00

requests

Fix Error 500 when using closes_issues API with an external issue tracker

2016-06-11 19:50:08 -07:00

routing

Revert "Fix merge conflicts - squashed commit"

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

services

Toggling a task in a description with mentions doesn't creates a Todo

2016-06-09 16:01:08 -03:00

support

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

2016-06-13 09:22:33 +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

Rename all [ci_]commit to [ci_]pipeline in specs and features

2016-06-03 16:22:26 +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