Robert SpeicherandRobert Speicher ff1e0ecfc6 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-31 19:26:59 -05:00

..

benchmarks

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

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

controllers

Merge branch 'highlight-blame' into 'master'

2016-01-31 19:26:59 -05:00

factories

Merge branch 'fix/commit-status-artifacts' into 'master'

2016-01-27 17:47:06 -05:00

features

Merge branch 'fix/commit-status-artifacts' into 'master'

2016-01-27 17:47:06 -05:00

finders

remove public field from namespace and refactoring

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

fixtures

Merge branch 'issue_3945' into 'master'

2016-01-20 16:56:13 -05:00

helpers

Merge branch 'issue_3945' into 'master'

2016-01-20 16:56:13 -05:00

initializers

Merge branch 'fix-gravator-default-url' into 'master'

2016-01-18 12:38:42 -05:00

javascripts

reverting more MR ajax files, will appear in different commit

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

lib

Merge branch 'highlight-blame' into 'master'

2016-01-31 19:26:59 -05:00

mailers

Merge branch 'add_email_headers' into 'master'

2016-01-19 16:25:21 -05:00

models

Merge branch 'mr-merge-base' into 'master'

2016-01-31 19:26:59 -05:00

requests

Merge branch 'fix-ci-runners-version-update' into 'master'

2016-01-27 17:47:23 -05:00

routing

Merge branch 'issue_3076' into 'master'

2016-01-08 15:52:05 +00:00

services

Merge branch 'issue_3945' into 'master'

2016-01-20 16:56:13 -05: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

Merge branch 'rs-rails-security' into 'master'

2016-01-25 15:26:24 -08:00

teaspoon_env.rb

teaspoon install

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