Douwe Maan ca8a44be82 Merge branch 'issue_13716' into 'master' ...

Check for conflicts before creating new revert branch

Fixes #13716 

See merge request !2953

2016-03-02 10:51:43 +00:00

..

benchmarks

Move Markdown/reference logic from Gitlab::Markdown to Banzai

2015-12-15 15:51:16 +01:00

config

Don't load all of GitLab in mail_room

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

controllers

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/contributions-forked-projects

2016-02-29 15:49:00 +01:00

factories

Branded login page also in CE

2016-02-26 15:50:51 +01:00

features

Fix issue milestone filter spec

2016-02-26 18:14:49 -05:00

finders

remove public field from namespace and refactoring

2016-01-04 16:00:29 +02:00

fixtures

Don't load all of GitLab in mail_room

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

helpers

Add :with_avatar trait to User factory

2016-02-24 13:50:03 -05:00

initializers

Ensure Gravatar host looks like an actual host

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

javascripts

Project dropdown test span -> i

2016-02-05 20:08:28 +00:00

lib

Add FilterArray class to Banzai

2016-03-01 15:54:35 -05:00

mailers

Move profile notifications specs to separate file

2016-02-12 14:01:28 +01:00

models

Add some specs for Repository#revert.

2016-03-01 19:16:27 -05:00

requests

Merge branch 'fix/commit-status-api-improvement' into 'master'

2016-03-01 16:50:23 +00:00

routing

Increase the minimum length for commit SHA matching to 7

2016-01-29 19:52:29 -05:00

services

Does not create a todo when commenting on commit or project snippet

2016-02-24 21:09:40 -03:00

support

Merge branch 'feature/jschatz1/sidebar-sizing' into 'master'

2016-02-24 23:09:29 +00:00

tasks/gitlab

Add lfs to backup specs.

2015-11-19 10:43:45 +01:00

views

Move "I should see Crowd login form" feature to a view spec

2016-02-24 17:38:13 -05:00

workers

Expire caches after forking/importing a repository

2016-02-17 11:38:18 +01:00

factories_spec.rb

Remove the invalid key factories

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

factories.rb

Reset otp_grace_period_started_at after disabling 2FA

2016-02-29 13:56:40 -05:00

rails_helper.rb

Started on the actual rspec 3 upgrade

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

spec_helper.rb

Add temporary monkey patch to get specs passing on 4.2.5.1

2016-01-25 14:53:28 -08:00

teaspoon_env.rb

teaspoon install

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