Douwe MaanandRémy Coutable 5f54c04cca Merge branch 'snippets-with-comments-cause-a-500-when-they-show-up-in-search-results-14764' into 'master' ...

Fix Error 500 when searching for a comment in a project snippet

Closes #14764. /cc @stanhu, and thank you for the spec! ;)

See merge request !3468

Signed-off-by: Rémy Coutable <remy@rymai.me>

2016-04-01 10:52:31 +02:00

..

config

Don't load all of GitLab in mail_room

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

controllers

Merge branch 'patch/fix-mergerequest-diff' into 'master'

2016-03-31 18:51:02 +02:00

factories

Merge branch 'fix/issue-move-rewrite-uploads' into 'master'

2016-04-01 10:01:22 +02:00

features

Merge branch 'snippets-with-comments-cause-a-500-when-they-show-up-in-search-results-14764' into 'master'

2016-04-01 10:52:31 +02:00

finders

Merge branch 'issue_12658' into 'master'

2016-03-21 21:37:57 -04:00

fixtures

Add support for keyword arguments in label reference method

2016-03-03 10:41:11 +01:00

helpers

Merge branch 'issue_12658' into 'master'

2016-03-21 21:37:57 -04:00

initializers

Ensure Gravatar host looks like an actual host

2016-01-18 14:58:16 +01:00

javascripts

Change js-quick-submit behavior to expect the class on the form

2016-03-02 15:11:15 -05:00

lib

Merge branch 'fix/issue-move-rewrite-uploads' into 'master'

2016-04-01 10:01:22 +02:00

mailers

Merge branch 'feature/issue-move' into 'master'

2016-03-21 16:40:17 +01:00

models

Merge branch 'fix-todos' into 'master'

2016-03-31 18:49:08 +02:00

requests

Merge branch '2489-soft-delete-issues' into 'master'

2016-03-22 12:36:02 +01:00

routing

Remove Profile::KeysController#new action

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

services

Merge branch 'fix-mentions-on-confidential-issues-for-non-members' into 'master'

2016-04-01 10:51:18 +02:00

support

Merge branch 'issue_12658' into 'master'

2016-03-21 21:37:57 -04:00

tasks/gitlab

Merge branch 'drop_db_before_restore' into 'master'

2016-03-23 12:25:06 +01: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 'issues-show-performance' into 'master'

2016-03-21 16:40:54 +01:00

factories_spec.rb

Merge branch 'fix/issue-move-rewrite-uploads' into 'master'

2016-04-01 10:01:22 +02:00

rails_helper.rb

Started on the actual rspec 3 upgrade

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

spec_helper.rb

Original implementation to allow users to subscribe to labels

2016-03-15 17:25:37 +01:00

teaspoon_env.rb

teaspoon install

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