Rémy CoutableandRobert Speicher 735d5cbc7d Merge branch 'fix/import-export-gitlab-errors' into 'master' ...

Fix errors found on importing GitLab CE repo

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

See merge request !4855

2016-06-23 14:36:40 -04:00

..

config

Enable the Rubocop DeprecatedClassMethods cop

2016-05-08 15:33:34 -06:00

controllers

Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-executed' into 'master'

2016-06-22 15:50:04 +02:00

factories

Merge branch 'feature/runner-lock-on-project' into 'master'

2016-06-21 12:17:20 -04:00

features

Merge branch '18871-check-improve-how-we-display-access-requesters-in-admin-area' into 'master'

2016-06-22 15:51:50 +02:00

finders

Fix notes on confidential issues through JSON to users without access

2016-06-14 17:51:17 -03:00

fixtures

Merge branch 'show-image-id-on-registry-page' into 'master'

2016-06-21 12:07:57 -04:00

helpers

Merge branch 'async-refs-dropdown' into 'master'

2016-06-21 11:51:23 -04:00

initializers

Add tests for setting trusted_proxies

2016-05-04 15:49:39 -07:00

javascripts

Merge branch 'category-search-dropdown' into 'master'

2016-06-15 20:56:15 -04:00

lib

Merge branch 'fix/import-export-gitlab-errors' into 'master'

2016-06-23 14:36:40 -04:00

mailers

Merge branch '18757-fix' into 'master'

2016-06-21 12:02:44 -04:00

models

Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-executed' into 'master'

2016-06-22 15:50:04 +02:00

requests

Merge branch '17521-gitlab-ci-yml-templates' into 'master'

2016-06-21 12:17:47 -04:00

routing

Merge branch 'health-check-route'

2016-05-12 16:39:03 -05:00

services

Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-executed' into 'master'

2016-06-22 15:50:04 +02:00

support

Merge branch 'feature/project-export' into 'master'

2016-06-17 14:18:15 -04:00

tasks/gitlab

Switch the gitlab:db:configure task to use tables.any? instead of looking specifically for the schema_migrations table

2016-05-25 10:47:09 -07: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 '18709-reduce-git-calls' into 'master'

2016-06-21 12:04:34 -04:00

factories_spec.rb

Enable RSpec/NotToNot cop and auto-correct offenses

2016-05-24 15:40:29 -04:00

rails_helper.rb

Started on the actual rspec 3 upgrade

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

spec_helper.rb

Enable Knapsack only in CI environment

2016-06-08 11:43:13 +02:00

teaspoon_env.rb

Add leading comment space cop

2016-05-31 19:33:46 -03:00