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
41061863
Commit
41061863
authored
Aug 30, 2019
by
Yorick Peterse
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve a few remaining CE/EE differences
parent
b2536f27
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
spec/db/schema_spec.rb
spec/db/schema_spec.rb
+1
-1
spec/spec_helper.rb
spec/spec_helper.rb
+1
-1
spec/support/helpers/test_env.rb
spec/support/helpers/test_env.rb
+1
-1
No files found.
spec/db/schema_spec.rb
View file @
41061863
...
...
@@ -4,7 +4,7 @@ require 'spec_helper'
require
Rails
.
root
.
join
(
'ee'
,
'spec'
,
'db'
,
'schema_support'
)
if
Gitlab
.
ee?
describe
'Database schema'
do
prepend
::
EE
::
DB
::
SchemaSupport
prepend
_if_ee
(
'EE::DB::SchemaSupport'
)
let
(
:connection
)
{
ActiveRecord
::
Base
.
connection
}
let
(
:tables
)
{
connection
.
tables
}
...
...
spec/spec_helper.rb
View file @
41061863
...
...
@@ -32,7 +32,7 @@ end
require
'rainbow/ext/string'
Rainbow
.
enabled
=
false
require_relative
'../ee/spec/spec_helper'
require_relative
(
'../ee/spec/spec_helper'
)
if
Gitlab
.
ee?
# Requires supporting ruby files with custom matchers and macros, etc,
# in spec/support/ and its subdirectories.
...
...
spec/support/helpers/test_env.rb
View file @
41061863
...
...
@@ -420,7 +420,7 @@ module TestEnv
end
end
require_relative
'../../../ee/spec/support/helpers/ee/test_env'
require_relative
(
'../../../ee/spec/support/helpers/ee/test_env'
)
if
Gitlab
.
ee?
::
TestEnv
.
prepend_if_ee
(
'::EE::TestEnv'
)
::
TestEnv
.
extend_if_ee
(
'::EE::TestEnv'
)
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