Yorick Peterse d39de0ea91 Resolved merge conflicts in ProjectsFinder ...

This also required some changes to the specs (as they weren't entirely
working correctly) and the ProjectsFinder itself to make it possible to
UNION more than 2 queries together.

2015-11-20 15:40:24 +01:00

..

benchmarks

Merge branch 'create-project-performance' into 'master'

2015-11-04 10:14:30 +00:00

controllers

Merge branch '8-2-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-2-stable-ce-to-ee

2015-11-20 14:05:09 +01:00

factories

Merge remote-tracking branch 'origin/master' into ce-to-ee

2015-11-16 17:05:47 +02:00

features

Merge 8-2-stable into 8-2-stable-ee

2015-11-19 10:33:18 -05:00

finders

Resolved merge conflicts in ProjectsFinder

2015-11-20 15:40:24 +01:00

fixtures

No HTML-only email please

2015-08-21 16:09:55 -07:00

helpers

Merge branch '8-2-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-2-stable-ce-to-ee

2015-11-20 14:05:09 +01:00

javascripts

Apply new design to files page

2015-10-13 16:41:48 +02:00

lib

Merge branch '8-2-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-2-stable-ce-to-ee

2015-11-20 14:05:09 +01:00

mailers

Merge remote-tracking branch 'origin/master' into ce_upsteram

2015-11-05 14:26:35 +02:00

models

Merge branch '8-2-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-2-stable-ce-to-ee

2015-11-20 14:05:09 +01:00

requests

Merge remote-tracking branch 'origin/master' into ce-to-ee

2015-11-16 13:37:13 +02:00

routing

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-09-16 10:26:10 +02:00

services

Merge branch '8-2-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-2-stable-ce-to-ee

2015-11-20 14:05:09 +01:00

support

Merge branch 'improve_jira_issue_closing' into 'master'

2015-11-06 04:47:21 +00:00

tasks/gitlab

Add lfs to backup specs.

2015-11-20 11:40:04 +01:00

views/help

Allow non-admin users to see version information

2015-09-23 17:18:15 -04:00

workers

Merge branch 'mirror-repository' into 'master'

2015-11-18 16:50:49 -05:00

factories_spec.rb

Remove the invalid key factories

2015-04-11 17:12:10 -04:00

factories.rb

Merge branch '8-2-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-2-stable-ce-to-ee

2015-11-20 14:05:09 +01:00

rails_helper.rb

Started on the actual rspec 3 upgrade

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

spec_helper.rb

Merge remote-tracking branch 'origin/master' into ce_upstream_15_10

2015-10-15 16:46:48 +03:00

teaspoon_env.rb

teaspoon install

2015-05-28 18:22:32 -04:00