Robert SpeicherandYorick Peterse 2d154e54b6 Merge branch '15529-fix=missing-from-clause-for-table-issues' into 'master' ...

Fix an issue when filtering merge requests with more than one label

Fixes #15529.

See merge request !3886

2016-05-12 15:08:00 +02:00

..

config

Don't load all of GitLab in mail_room

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

controllers

Merge branch 'fix-impersonation-issue' into 'master'

2016-04-25 21:52:40 +00:00

factories

Merge branch 'slack_wiki_notifications' into 'master'

2016-04-20 10:49:31 +02:00

features

Merge branch '15529-fix=missing-from-clause-for-table-issues' into 'master'

2016-05-12 15:08:00 +02:00

finders

Merge branch 'multi-filter-labels' into 'master'

2016-04-21 09:23:28 +00: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 remote-tracking branch 'dev/8-7-stable' into 8-7-stable

2016-05-02 20:00:11 -04:00

initializers

Merge branch 'trusted-proxies-ip-addr' into 'master'

2016-05-11 11:00:11 +02:00

javascripts

Merge branch 'fix-build-notification-on-merge-page-change' into 'master'

2016-05-12 15:05:07 +02:00

lib

Merge branch '16568-relative-links-wiki-regression' into 'master'

2016-05-12 15:03:49 +02:00

mailers

format merge request references properly

2016-04-19 19:18:56 +02:00

models

Merge branch '15437-fix-xss-in-issue-tracker-service' into 'master'

2016-04-25 21:55:52 +00:00

requests

Merge branch 'fix-project-hook-delete-permissions' into 'master'

2016-04-27 13:32:55 -04:00

routing

Remove Profile::KeysController#new action

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

services

Merge branch 'fix/private-labels-permissions' into 'master'

2016-04-22 10:53:54 +02:00

support

Merge branch '15437-fix-xss-in-issue-tracker-service' into 'master'

2016-04-25 21:55:52 +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

Merge branch 'create-wikis-during-check' into 'master'

2016-05-05 19:37:04 +02: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