Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
86498d4d
Commit
86498d4d
authored
8 years ago
by
Kamil Trzcinski
Browse files
Options
Download
Email Patches
Plain Diff
Use knapsack everywhere
parent
792670f4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
Rakefile
Rakefile
+1
-1
features/support/env.rb
features/support/env.rb
+1
-1
spec/spec_helper.rb
spec/spec_helper.rb
+1
-1
No files found.
Rakefile
View file @
86498d4d
...
...
@@ -3,7 +3,7 @@
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
require
File
.
expand_path
(
'../config/application'
,
__FILE__
)
require
'knapsack
-gitlab
'
require
'knapsack'
relative_url_conf
=
File
.
expand_path
(
'../config/initializers/relative_url'
,
__FILE__
)
require
relative_url_conf
if
File
.
exist?
(
"
#{
relative_url_conf
}
.rb"
)
...
...
This diff is collapsed.
Click to expand it.
features/support/env.rb
View file @
86498d4d
...
...
@@ -11,7 +11,7 @@ ENV['RAILS_ENV'] = 'test'
require
'./config/environment'
require
'rspec/expectations'
require
'sidekiq/testing/inline'
require
'knapsack
-gitlab
'
require
'knapsack'
require_relative
'capybara'
require_relative
'db_cleaner'
...
...
This diff is collapsed.
Click to expand it.
spec/spec_helper.rb
View file @
86498d4d
...
...
@@ -15,7 +15,7 @@ require 'rspec/rails'
require
'shoulda/matchers'
require
'sidekiq/testing/inline'
require
'rspec/retry'
require
'knapsack
-gitlab
'
require
'knapsack'
require_relative
'knapsack_merger'
Knapsack
::
Adapters
::
RSpecAdapter
.
bind
...
...
This diff is collapsed.
Click to expand it.
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