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
44796f34
Commit
44796f34
authored
Dec 11, 2019
by
Fabio Pitino
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Turn job_log_json feature flag on by default
Ensure that all specs run against the new log
parent
bc4ad61f
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
3 additions
and
20 deletions
+3
-20
app/controllers/projects/jobs_controller.rb
app/controllers/projects/jobs_controller.rb
+2
-2
spec/controllers/projects/jobs_controller_spec.rb
spec/controllers/projects/jobs_controller_spec.rb
+1
-2
spec/features/projects/jobs/permissions_spec.rb
spec/features/projects/jobs/permissions_spec.rb
+0
-1
spec/features/projects/jobs/user_browses_job_spec.rb
spec/features/projects/jobs/user_browses_job_spec.rb
+0
-2
spec/features/projects/jobs_spec.rb
spec/features/projects/jobs_spec.rb
+0
-1
spec/features/security/project/internal_access_spec.rb
spec/features/security/project/internal_access_spec.rb
+0
-4
spec/features/security/project/private_access_spec.rb
spec/features/security/project/private_access_spec.rb
+0
-4
spec/features/security/project/public_access_spec.rb
spec/features/security/project/public_access_spec.rb
+0
-4
No files found.
app/controllers/projects/jobs_controller.rb
View file @
44796f34
...
...
@@ -12,7 +12,7 @@ class Projects::JobsController < Projects::ApplicationController
before_action
:authorize_use_build_terminal!
,
only:
[
:terminal
,
:terminal_websocket_authorize
]
before_action
:verify_api_request!
,
only: :terminal_websocket_authorize
before_action
only:
[
:show
]
do
push_frontend_feature_flag
(
:job_log_json
,
project
)
push_frontend_feature_flag
(
:job_log_json
,
project
,
default_enabled:
true
)
end
layout
'project'
...
...
@@ -53,7 +53,7 @@ class Projects::JobsController < Projects::ApplicationController
format
.
json
do
# TODO: when the feature flag is removed we should not pass
# content_format to serialize method.
content_format
=
Feature
.
enabled?
(
:job_log_json
,
@project
)
?
:json
:
:html
content_format
=
Feature
.
enabled?
(
:job_log_json
,
@project
,
default_enabled:
true
)
?
:json
:
:html
build_trace
=
Ci
::
BuildTrace
.
new
(
build:
@build
,
...
...
spec/controllers/projects/jobs_controller_spec.rb
View file @
44796f34
...
...
@@ -11,7 +11,6 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do
before
do
stub_feature_flags
(
ci_enable_live_trace:
true
)
stub_feature_flags
(
job_log_json:
false
)
stub_not_protect_default_branch
end
...
...
@@ -527,7 +526,6 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do
describe
'GET trace.json'
do
before
do
stub_feature_flags
(
job_log_json:
true
)
get_trace
end
...
...
@@ -634,6 +632,7 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do
describe
'GET legacy trace.json'
do
before
do
stub_feature_flags
(
job_log_json:
false
)
get_trace
end
...
...
spec/features/projects/jobs/permissions_spec.rb
View file @
44796f34
...
...
@@ -10,7 +10,6 @@ describe 'Project Jobs Permissions' do
let!
(
:job
)
{
create
(
:ci_build
,
:running
,
:coverage
,
:trace_artifact
,
pipeline:
pipeline
)
}
before
do
stub_feature_flags
(
job_log_json:
true
)
sign_in
(
user
)
project
.
enable_ci
...
...
spec/features/projects/jobs/user_browses_job_spec.rb
View file @
44796f34
...
...
@@ -10,8 +10,6 @@ describe 'User browses a job', :js do
let!
(
:build
)
{
create
(
:ci_build
,
:success
,
:trace_artifact
,
:coverage
,
pipeline:
pipeline
)
}
before
do
stub_feature_flags
(
job_log_json:
false
)
project
.
add_maintainer
(
user
)
project
.
enable_ci
...
...
spec/features/projects/jobs_spec.rb
View file @
44796f34
...
...
@@ -22,7 +22,6 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
before
do
project
.
add_role
(
user
,
user_access_level
)
sign_in
(
user
)
stub_feature_flags
(
job_log_json:
false
)
end
describe
"GET /:project/jobs"
do
...
...
spec/features/security/project/internal_access_spec.rb
View file @
44796f34
...
...
@@ -7,10 +7,6 @@ describe "Internal Project Access" do
set
(
:project
)
{
create
(
:project
,
:internal
,
:repository
)
}
before
do
stub_feature_flags
(
job_log_json:
false
)
end
describe
"Project should be internal"
do
describe
'#internal?'
do
subject
{
project
.
internal?
}
...
...
spec/features/security/project/private_access_spec.rb
View file @
44796f34
...
...
@@ -7,10 +7,6 @@ describe "Private Project Access" do
set
(
:project
)
{
create
(
:project
,
:private
,
:repository
,
public_builds:
false
)
}
before
do
stub_feature_flags
(
job_log_json:
false
)
end
describe
"Project should be private"
do
describe
'#private?'
do
subject
{
project
.
private?
}
...
...
spec/features/security/project/public_access_spec.rb
View file @
44796f34
...
...
@@ -7,10 +7,6 @@ describe "Public Project Access" do
set
(
:project
)
{
create
(
:project
,
:public
,
:repository
)
}
before
do
stub_feature_flags
(
job_log_json:
false
)
end
describe
"Project should be public"
do
describe
'#public?'
do
subject
{
project
.
public?
}
...
...
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