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
b8a40966
Commit
b8a40966
authored
Jul 02, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
b2112649
34a22b83
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
.gitlab/ci/frontend.gitlab-ci.yml
.gitlab/ci/frontend.gitlab-ci.yml
+4
-4
.gitlab/ci/rails.gitlab-ci.yml
.gitlab/ci/rails.gitlab-ci.yml
+2
-2
No files found.
.gitlab/ci/frontend.gitlab-ci.yml
View file @
b8a40966
...
...
@@ -168,8 +168,8 @@ karma:
paths
:
-
chrome_debug.log
-
coverage-javascript/
reports
:
junit
:
junit_karma.xml
#
reports:
#
junit: junit_karma.xml
jest
:
extends
:
.dedicated-no-docs-and-no-qa-pull-cache-job
...
...
@@ -191,8 +191,8 @@ jest:
paths
:
-
coverage-frontend/
-
junit_jest.xml
reports
:
junit
:
junit_jest.xml
#
reports:
#
junit: junit_jest.xml
cache
:
key
:
jest
paths
:
...
...
.gitlab/ci/rails.gitlab-ci.yml
View file @
b8a40966
...
...
@@ -77,8 +77,8 @@
-
rspec_flaky/
-
rspec_profiling/
-
tmp/capybara/
reports
:
junit
:
junit_rspec.xml
#
reports:
#
junit: junit_rspec.xml
.rspec-metadata-pg
:
&rspec-metadata-pg
<<
:
*rspec-metadata
...
...
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