diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-10 17:04:12 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-10 17:04:12 +0300 |
commit | e407a481f2b52342c79e6a7eca2e785a6e943d2f (patch) | |
tree | 0ad9d4659255a00caafb22fb068f6c1066d8affe /lib | |
parent | 5a9135ade88e26d21ab2523e7e0c0e4a5bfe4cc0 (diff) | |
parent | 94cbf0091f44e879c02066aab7ec0a44eaeb14c3 (diff) |
Merge branch 'rs-pre-rspec-3' into 'master'
Changes back-ported from rspec3 branch
This is just breaking up the large `road-to-rspec-3` branch a bit. Each of these commits have been cherry-picked and would be good to have in place before the upgrade.
See merge request !792
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/gitorious_import.rb | 5 | ||||
-rw-r--r-- | lib/gitlab/gitorious_import/client.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/gitorious_import/repository.rb | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/lib/gitlab/gitorious_import.rb b/lib/gitlab/gitorious_import.rb new file mode 100644 index 00000000000..8d0132a744c --- /dev/null +++ b/lib/gitlab/gitorious_import.rb @@ -0,0 +1,5 @@ +module Gitlab + module GitoriousImport + GITORIOUS_HOST = "https://gitorious.org" + end +end diff --git a/lib/gitlab/gitorious_import/client.rb b/lib/gitlab/gitorious_import/client.rb index 1fa89dba448..99fe5bdebfc 100644 --- a/lib/gitlab/gitorious_import/client.rb +++ b/lib/gitlab/gitorious_import/client.rb @@ -1,7 +1,5 @@ module Gitlab module GitoriousImport - GITORIOUS_HOST = "https://gitorious.org" - class Client attr_reader :repo_list diff --git a/lib/gitlab/gitorious_import/repository.rb b/lib/gitlab/gitorious_import/repository.rb index f702797dc6e..c88f1ae358d 100644 --- a/lib/gitlab/gitorious_import/repository.rb +++ b/lib/gitlab/gitorious_import/repository.rb @@ -1,7 +1,5 @@ module Gitlab module GitoriousImport - GITORIOUS_HOST = "https://gitorious.org" - Repository = Struct.new(:full_name) do def id Digest::SHA1.hexdigest(full_name) |