BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
01c2a50f
Commit
01c2a50f
authored
Feb 10, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'rspec-profiling-branch-name-in-ci' into 'master'
rspec_profiling: Discover the correct branch name in GitLab CI See merge request !9134
parents
6cbfe139
fd383970
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
0 deletions
+8
-0
rspec_profiling.rb
config/initializers/rspec_profiling.rb
+8
-0
No files found.
config/initializers/rspec_profiling.rb
View file @
01c2a50f
...
@@ -4,6 +4,12 @@ module RspecProfilingConnection
...
@@ -4,6 +4,12 @@ module RspecProfilingConnection
end
end
end
end
module
RspecProfilingGitBranchCi
def
branch
ENV
[
'CI_BUILD_REF_NAME'
]
||
super
end
end
if
Rails
.
env
.
test?
if
Rails
.
env
.
test?
RspecProfiling
.
configure
do
|
config
|
RspecProfiling
.
configure
do
|
config
|
if
ENV
[
'RSPEC_PROFILING_POSTGRES_URL'
]
if
ENV
[
'RSPEC_PROFILING_POSTGRES_URL'
]
...
@@ -11,4 +17,6 @@ if Rails.env.test?
...
@@ -11,4 +17,6 @@ if Rails.env.test?
config
.
collector
=
RspecProfiling
::
Collectors
::
PSQL
config
.
collector
=
RspecProfiling
::
Collectors
::
PSQL
end
end
end
end
RspecProfiling
::
VCS
::
Git
.
prepend
(
RspecProfilingGitBranchCi
)
if
ENV
.
has_key?
(
'CI'
)
end
end
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