Dmitriy Zaporozhets 5daf44b7c8 Merge branch 'revert-satellites' into 'master' ...

Revert satellites

Return satellites to master for 7.14

We remove satellites in next release (8.0)

See merge request !1136

2015-08-11 12:27:38 +00:00

..

controllers

Show incompatible projects in Bitbucket import status

2015-08-07 07:07:08 -07:00

factories

Allow users to send abuse reports

2015-08-06 14:03:27 +02:00

features

Fix spec

2015-08-06 17:15:37 +02:00

finders

Add Group#add_* convenience methods

2015-08-07 00:20:02 -04:00

fixtures

Add RelativeLinkFilter section to Markdown fixture

2015-07-28 18:56:27 -04:00

helpers

Fix diff syntax highlighting

2015-08-10 08:07:26 -07:00

javascripts

Fix the "Reload with full diff" URL button

2015-07-23 12:53:54 -07:00

lib

Revert "Merge branch 'drop-satellites'"

2015-08-11 10:28:42 +02:00

mailers

Merge branch 'master' into rubocop-for-tests

2015-06-23 10:44:03 +02:00

models

Revert "Merge branch 'refactor-can-be-merge' into 'master'"

2015-08-11 10:48:02 +02:00

requests/api

Merge branch 'revert-satellites' into 'master'

2015-08-11 12:27:38 +00:00

routing

Revert "Merge branch 'drop-satellites'"

2015-08-11 10:28:42 +02:00

services

Revert "Merge branch 'drop-satellites'"

2015-08-11 10:28:42 +02:00

support

Revert "Merge branch 'drop-satellites'"

2015-08-11 10:28:42 +02:00

tasks/gitlab

Use a separate backup test directory and nuke its contents

2015-07-24 18:54:06 +02:00

workers

Merge branch 'master' into rubocop-for-tests

2015-06-23 10:44:03 +02:00

factories_spec.rb

Remove the invalid key factories

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

factories.rb

Only publish ssh key-type and key

2015-08-04 14:33: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 coverage-related setup back to spec_helper

2015-07-13 22:41:47 -04:00

teaspoon_env.rb

teaspoon install

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