Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
f2b37de5
Commit
f2b37de5
authored
Feb 18, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix specs.
parent
448817c4
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
2 deletions
+5
-2
config/initializers/public_key.rb
config/initializers/public_key.rb
+1
-1
lib/gitlab/bitbucket_import.rb
lib/gitlab/bitbucket_import.rb
+1
-1
spec/controllers/import/bitbucket_controller_spec.rb
spec/controllers/import/bitbucket_controller_spec.rb
+1
-0
spec/controllers/import/github_controller_spec.rb
spec/controllers/import/github_controller_spec.rb
+1
-0
spec/controllers/import/gitlab_controller_spec.rb
spec/controllers/import/gitlab_controller_spec.rb
+1
-0
No files found.
config/initializers/public_key.rb
View file @
f2b37de5
path
=
File
.
expand_path
(
"~/.ssh/id_rsa.pub"
)
path
=
File
.
expand_path
(
"~/.ssh/id_rsa.pub"
)
Gitlab
::
BitbucketImport
.
public_key
=
File
.
read
(
path
)
if
File
.
exist?
(
path
)
Gitlab
::
BitbucketImport
.
public_key
=
File
.
read
(
path
)
if
File
.
exist?
(
path
)
\ No newline at end of file
lib/gitlab/bitbucket_import.rb
View file @
f2b37de5
...
@@ -3,4 +3,4 @@ module Gitlab
...
@@ -3,4 +3,4 @@ module Gitlab
mattr_accessor
:public_key
mattr_accessor
:public_key
@public_key
=
nil
@public_key
=
nil
end
end
end
end
\ No newline at end of file
spec/controllers/import/bitbucket_controller_spec.rb
View file @
f2b37de5
...
@@ -5,6 +5,7 @@ describe Import::BitbucketController do
...
@@ -5,6 +5,7 @@ describe Import::BitbucketController do
before
do
before
do
sign_in
(
user
)
sign_in
(
user
)
controller
.
stub
(
:bitbucket_import_enabled?
).
and_return
(
true
)
end
end
describe
"GET callback"
do
describe
"GET callback"
do
...
...
spec/controllers/import/github_controller_spec.rb
View file @
f2b37de5
...
@@ -5,6 +5,7 @@ describe Import::GithubController do
...
@@ -5,6 +5,7 @@ describe Import::GithubController do
before
do
before
do
sign_in
(
user
)
sign_in
(
user
)
controller
.
stub
(
:github_import_enabled?
).
and_return
(
true
)
end
end
describe
"GET callback"
do
describe
"GET callback"
do
...
...
spec/controllers/import/gitlab_controller_spec.rb
View file @
f2b37de5
...
@@ -5,6 +5,7 @@ describe Import::GitlabController do
...
@@ -5,6 +5,7 @@ describe Import::GitlabController do
before
do
before
do
sign_in
(
user
)
sign_in
(
user
)
controller
.
stub
(
:gitlab_import_enabled?
).
and_return
(
true
)
end
end
describe
"GET callback"
do
describe
"GET callback"
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment