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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
eb950191
Commit
eb950191
authored
Jun 08, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable Knapsack only in CI environment
parent
915ad255
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
CHANGELOG
CHANGELOG
+1
-0
features/support/env.rb
features/support/env.rb
+4
-2
spec/spec_helper.rb
spec/spec_helper.rb
+4
-2
No files found.
CHANGELOG
View file @
eb950191
...
...
@@ -38,6 +38,7 @@ v 8.9.0 (unreleased)
- Make authentication service for Container Registry to be compatible with < Docker 1.11
- Add Application Setting to configure Container Registry token expire delay (default 5min)
- Cache assigned issue and merge request counts in sidebar nav
- Use Knapsack only in CI environment
- Cache project build count in sidebar nav
- Reduce number of queries needed to render issue labels in the sidebar
- Improve error handling importing projects
...
...
features/support/env.rb
View file @
eb950191
...
...
@@ -11,13 +11,15 @@ ENV['RAILS_ENV'] = 'test'
require
'./config/environment'
require
'rspec/expectations'
require
'sidekiq/testing/inline'
require
'knapsack'
require_relative
'capybara'
require_relative
'db_cleaner'
require_relative
'rerun'
Knapsack
::
Adapters
::
SpinachAdapter
.
bind
if
ENV
[
'CI'
]
require
'knapsack'
Knapsack
::
Adapters
::
RSpecAdapter
.
bind
end
%w(select2_helper test_env repo_helpers)
.
each
do
|
f
|
require
Rails
.
root
.
join
(
'spec'
,
'support'
,
f
)
...
...
spec/spec_helper.rb
View file @
eb950191
...
...
@@ -15,9 +15,11 @@ require 'rspec/rails'
require
'shoulda/matchers'
require
'sidekiq/testing/inline'
require
'rspec/retry'
require
'knapsack'
Knapsack
::
Adapters
::
RSpecAdapter
.
bind
if
ENV
[
'CI'
]
require
'knapsack'
Knapsack
::
Adapters
::
RSpecAdapter
.
bind
end
# Requires supporting ruby files with custom matchers and macros, etc,
# in spec/support/ and its subdirectories.
...
...
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