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
8aa381c9
Commit
8aa381c9
authored
Oct 12, 2016
by
Yorick Peterse
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'tests-use-tmpfs' into 'master'"
This reverts merge request !6730
parent
9b04e69a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
7 deletions
+0
-7
.gitlab-ci.yml
.gitlab-ci.yml
+0
-2
spec/spec_helper.rb
spec/spec_helper.rb
+0
-5
No files found.
.gitlab-ci.yml
View file @
8aa381c9
...
@@ -19,8 +19,6 @@ variables:
...
@@ -19,8 +19,6 @@ variables:
before_script
:
before_script
:
-
source ./scripts/prepare_build.sh
-
source ./scripts/prepare_build.sh
-
cp config/gitlab.yml.example config/gitlab.yml
-
cp config/gitlab.yml.example config/gitlab.yml
-
mkdir -p tmp/tests
-
mount -t tmpfs tmpfs tmp/tests || echo "tmpfs mount failed, falling back to disc"
-
bundle --version
-
bundle --version
-
'
[
"$USE_BUNDLE_INSTALL"
!=
"true"
]
||
retry
bundle
install
--without
postgres
production
--jobs
$(nproc)
"${FLAGS[@]}"'
-
'
[
"$USE_BUNDLE_INSTALL"
!=
"true"
]
||
retry
bundle
install
--without
postgres
production
--jobs
$(nproc)
"${FLAGS[@]}"'
-
retry gem install knapsack
-
retry gem install knapsack
...
...
spec/spec_helper.rb
View file @
8aa381c9
...
@@ -50,11 +50,6 @@ RSpec.configure do |config|
...
@@ -50,11 +50,6 @@ RSpec.configure do |config|
example
.
run
example
.
run
Rails
.
cache
=
caching_store
Rails
.
cache
=
caching_store
end
end
config
.
after
(
:each
)
do
FileUtils
.
rm_rf
(
"tmp/tests/repositories"
)
FileUtils
.
mkdir_p
(
"tmp/tests/repositories"
)
end
end
end
FactoryGirl
::
SyntaxRunner
.
class_eval
do
FactoryGirl
::
SyntaxRunner
.
class_eval
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