Robert Speicher 2b1ddb0f80 Merge branch 'mr-merge-base' into 'master' ...

Correctly determine MR diff base when MR has merge conflicts

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12779

See merge request !2632

2016-01-28 21:08:41 +00:00

..

benchmarks

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

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

controllers

Move blame group logic to dedicated class

2016-01-28 14:49:21 +01:00

factories

Update commit status factory to reflect recent changes

2016-01-26 15:23:57 +01:00

features

Merge branch 'rs-2fa-requirement-wording' into 'master'

2016-01-27 19:04:44 +00:00

finders

remove public field from namespace and refactoring

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

fixtures

Update tests

2016-01-20 17:14:26 +01:00

helpers

Update text_color_for_bg helper to support RGB triplet color codes

2016-01-24 15:06:46 -08:00

initializers

Ensure Gravatar host looks like an actual host

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

javascripts

reverting more MR ajax files, will appear in different commit

2016-01-12 14:55:54 -05:00

lib

Move blame group logic to dedicated class

2016-01-28 14:49:21 +01:00

mailers

Added X-GitLab-... headers to emails from CI and Email On Push services

2016-01-19 20:18:39 +02:00

models

Merge branch 'master' into mr-merge-base

2016-01-28 15:12:24 +01:00

requests

Improve consistency and duplication for Merge Request API

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

routing

Fix broken specs. #2406

2016-01-20 00:14:58 -05:00

services

Extract Projects::ImportService service from RepositoryImportWorker

2016-01-25 22:58:30 -02:00

support

Let the CI runner know about builds that this build depends on

2016-01-14 19:45:55 +01:00

tasks/gitlab

Add lfs to backup specs.

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

views/help

Allow non-admin users to see version information

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

workers

Write to InfluxDB directly via UDP

2015-12-29 14:53:45 +01:00

factories_spec.rb

Remove the invalid key factories

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

factories.rb

Unsubscribe from thread through link in email footer

2016-01-09 12:41:22 +01: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