diff options
| author | James Lopez <james@jameslopez.es> | 2016-06-13 14:00:19 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-06-13 14:00:19 +0200 |
| commit | e83fc684a583140ce30644a7062f8470880fdf43 (patch) | |
| tree | 6c2a2f52da54d58def135757fcb5f14db8dd8a20 /spec/controllers/import/github_controller_spec.rb | |
| parent | f70c000924c82bc579310fe784a6df159d15618b (diff) | |
| parent | 6f0c503397e184d2a68eec8d4285288abc29ce9a (diff) | |
| download | gitlab-ce-e83fc684a583140ce30644a7062f8470880fdf43.tar.gz | |
Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
# Conflicts:
# Gemfile.lock
# app/helpers/todos_helper.rb
# app/models/todo.rb
# app/views/projects/edit.html.haml
# lib/gitlab/import_export/import_service.rb
Diffstat (limited to 'spec/controllers/import/github_controller_spec.rb')
| -rw-r--r-- | spec/controllers/import/github_controller_spec.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/controllers/import/github_controller_spec.rb b/spec/controllers/import/github_controller_spec.rb index bcc713dce2a..c55a3c28208 100644 --- a/spec/controllers/import/github_controller_spec.rb +++ b/spec/controllers/import/github_controller_spec.rb @@ -1,5 +1,4 @@ require 'spec_helper' -require_relative 'import_spec_helper' describe Import::GithubController do include ImportSpecHelper |