Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
36d4821cef8c
Commit
36d4821c
authored
Nov 27, 2019
by
GitLab Bot
Browse files
Add latest changes from gitlab-org/gitlab@master
parent
5718bcccefae
Changes
34
Hide whitespace changes
Inline
Side-by-side
app/assets/javascripts/environments/folder/environments_folder_view.vue
View file @
36d4821c
...
...
@@ -40,9 +40,8 @@
<div
:class=
"cssContainerClass"
>
<stop-environment-modal
:environment=
"environmentInStopModal"
/>
<div
v-if=
"!isLoading"
class=
"top-area"
>
<h4
class=
"js-folder-name environments-folder-name"
>
{{
s__
(
'
Environments|Environments
'
)
}}
/
<b>
{{
folderName
}}
</b>
</h4>
<h4
class=
"js-folder-name environments-folder-name"
>
{{
s__
(
'
Environments|Environments
'
)
}}
/
<b>
{{
folderName
}}
</b>
</h4>
...
...
@@ -48,5 +47,6 @@
<tabs
:tabs=
"tabs"
scope=
"environments"
@
onChangeTab=
"onChangeTab"
/>
<div
class=
"top-area"
>
<tabs
v-if=
"!isLoading"
:tabs=
"tabs"
scope=
"environments"
@
onChangeTab=
"onChangeTab"
/>
</div>
<container
...
...
app/assets/stylesheets/pages/environments.scss
View file @
36d4821c
...
...
@@ -7,7 +7,6 @@
.environments-folder-name
{
font-weight
:
$gl-font-weight-normal
;
padding-top
:
20px
;
}
.environments-container
{
...
...
app/models/ci/build_trace_section.rb
View file @
36d4821c
...
...
@@ -4,9 +4,6 @@
class
BuildTraceSection
<
ApplicationRecord
extend
Gitlab
::
Ci
::
Model
# Only remove > 2019-11-22 and > 12.5
self
.
ignored_columns
+=
%i[id]
belongs_to
:build
,
class_name:
'Ci::Build'
belongs_to
:project
belongs_to
:section_name
,
class_name:
'Ci::BuildTraceSectionName'
...
...
app/models/merge_request.rb
View file @
36d4821c
...
...
@@ -420,15 +420,6 @@
limit
?
shas
.
take
(
limit
)
:
shas
end
# Returns true if there are commits that match at least one commit SHA.
def
includes_any_commits?
(
shas
)
if
persisted?
merge_request_diff
.
commits_by_shas
(
shas
).
exists?
else
(
commit_shas
&
shas
).
present?
end
end
def
supports_suggestion?
true
end
...
...
app/models/merge_request_diff.rb
View file @
36d4821c
...
...
@@ -10,6 +10,7 @@
# Don't display more than 100 commits at once
COMMITS_SAFE_SIZE
=
100
BATCH_SIZE
=
1000
# Applies to closed or merged MRs when determining whether to migrate their
# diffs to external storage
...
...
@@ -254,6 +255,6 @@
merge_request_diff_commits
.
limit
(
limit
).
pluck
(
:sha
)
end
def
commits_by_shas
(
shas
)
return
MergeRequestDiffCommit
.
none
unless
shas
.
present
?
def
includes_any_commits?
(
shas
)
return
false
if
shas
.
blank
?
...
...
@@ -259,5 +260,9 @@
merge_request_diff_commits
.
where
(
sha:
shas
)
# when the number of shas is huge (1000+) we don't want
# to pass them all as an SQL param, let's pass them in batches
shas
.
each_slice
(
BATCH_SIZE
).
any?
do
|
batched_shas
|
merge_request_diff_commits
.
where
(
sha:
batched_shas
).
exists?
end
end
def
diff_refs
=
(
new_diff_refs
)
...
...
app/models/project.rb
View file @
36d4821c
...
...
@@ -62,20 +62,6 @@
cache_markdown_field
:description
,
pipeline: :description
delegate
:feature_available?
,
:builds_enabled?
,
:wiki_enabled?
,
:merge_requests_enabled?
,
:issues_enabled?
,
:pages_enabled?
,
:public_pages?
,
:private_pages?
,
:merge_requests_access_level
,
:issues_access_level
,
:wiki_access_level
,
:snippets_access_level
,
:builds_access_level
,
:repository_access_level
,
to: :project_feature
,
allow_nil:
true
delegate
:base_dir
,
:disk_path
,
to: :storage
delegate
:scheduled?
,
:started?
,
:in_progress?
,
:failed?
,
:finished?
,
prefix: :import
,
to: :import_state
,
allow_nil:
true
delegate
:no_import?
,
to: :import_state
,
allow_nil:
true
# TODO: remove once GitLab 12.5 is released
# https://gitlab.com/gitlab-org/gitlab/issues/34638
self
.
ignored_columns
+=
%i[merge_requests_require_code_owner_approval]
...
...
@@ -323,6 +309,15 @@
accepts_nested_attributes_for
:metrics_setting
,
update_only:
true
,
allow_destroy:
true
accepts_nested_attributes_for
:grafana_integration
,
update_only:
true
,
allow_destroy:
true
delegate
:feature_available?
,
:builds_enabled?
,
:wiki_enabled?
,
:merge_requests_enabled?
,
:issues_enabled?
,
:pages_enabled?
,
:public_pages?
,
:private_pages?
,
:merge_requests_access_level
,
:issues_access_level
,
:wiki_access_level
,
:snippets_access_level
,
:builds_access_level
,
:repository_access_level
,
to: :project_feature
,
allow_nil:
true
delegate
:scheduled?
,
:started?
,
:in_progress?
,
:failed?
,
:finished?
,
prefix: :import
,
to: :import_state
,
allow_nil:
true
delegate
:base_dir
,
:disk_path
,
to: :storage
delegate
:no_import?
,
to: :import_state
,
allow_nil:
true
delegate
:name
,
to: :owner
,
allow_nil:
true
,
prefix:
true
delegate
:members
,
to: :team
,
prefix:
true
delegate
:add_user
,
:add_users
,
to: :team
...
...
app/services/merge_requests/refresh_service.rb
View file @
36d4821c
...
...
@@ -106,7 +106,7 @@
filter_merge_requests
(
merge_requests
).
each
do
|
merge_request
|
if
branch_and_project_match?
(
merge_request
)
||
@push
.
force_push?
merge_request
.
reload_diff
(
current_user
)
elsif
merge_request
.
includes_any_commits?
(
push_commit_ids
)
elsif
merge_request
.
merge_request_diff
.
includes_any_commits?
(
push_commit_ids
)
merge_request
.
reload_diff
(
current_user
)
end
...
...
app/services/metrics/dashboard/base_embed_service.rb
View file @
36d4821c
...
...
@@ -13,7 +13,7 @@
def
dashboard_path
params
[
:dashboard_path
].
presence
||
::
Metrics
::
Dashboard
::
SystemDashboardService
::
SYSTEM_
DASHBOARD_PATH
::
Metrics
::
Dashboard
::
SystemDashboardService
::
DASHBOARD_PATH
end
def
group
...
...
app/services/metrics/dashboard/custom_metric_embed_service.rb
View file @
36d4821c
...
...
@@ -40,7 +40,7 @@
# All custom metrics are displayed on the system dashboard.
# Nil is acceptable as we'll default to the system dashboard.
def
valid_dashboard?
(
dashboard
)
dashboard
.
nil?
||
::
Metrics
::
Dashboard
::
SystemDashboardService
.
system
_dashboard?
(
dashboard
)
dashboard
.
nil?
||
::
Metrics
::
Dashboard
::
SystemDashboardService
.
matching
_dashboard?
(
dashboard
)
end
end
...
...
app/services/metrics/dashboard/predefined_dashboard_service.rb
0 → 100644
View file @
36d4821c
# frozen_string_literal: true
module
Metrics
module
Dashboard
class
PredefinedDashboardService
<
::
Metrics
::
Dashboard
::
BaseService
# These constants should be overridden in the inheriting class. For Ex:
# DASHBOARD_PATH = 'config/prometheus/common_metrics.yml'
# DASHBOARD_NAME = 'Default'
DASHBOARD_PATH
=
nil
DASHBOARD_NAME
=
nil
SEQUENCE
=
[
STAGES
::
EndpointInserter
,
STAGES
::
Sorter
].
freeze
class
<<
self
def
matching_dashboard?
(
filepath
)
filepath
==
self
::
DASHBOARD_PATH
end
end
private
def
cache_key
"metrics_dashboard_
#{
dashboard_path
}
"
end
def
dashboard_path
self
.
class
::
DASHBOARD_PATH
end
# Returns the base metrics shipped with every GitLab service.
def
get_raw_dashboard
yml
=
File
.
read
(
Rails
.
root
.
join
(
dashboard_path
))
YAML
.
safe_load
(
yml
)
end
def
sequence
self
.
class
::
SEQUENCE
end
end
end
end
app/services/metrics/dashboard/system_dashboard_service.rb
View file @
36d4821c
# frozen_string_literal: true
# Fetches the system metrics dashboard and formats the output.
# Use Gitlab::Metrics::Dashboard::Finder to retrive dashboards.
# Use Gitlab::Metrics::Dashboard::Finder to retri
e
ve dashboards.
module
Metrics
module
Dashboard
...
...
@@ -5,8 +5,8 @@
module
Metrics
module
Dashboard
class
SystemDashboardService
<
::
Metrics
::
Dashboard
::
Base
Service
SYSTEM_
DASHBOARD_PATH
=
'config/prometheus/common_metrics.yml'
SYSTEM_
DASHBOARD_NAME
=
'Default'
class
SystemDashboardService
<
::
Metrics
::
Dashboard
::
PredefinedDashboard
Service
DASHBOARD_PATH
=
'config/prometheus/common_metrics.yml'
DASHBOARD_NAME
=
'Default'
SEQUENCE
=
[
STAGES
::
CommonMetricsInserter
,
...
...
@@ -18,9 +18,9 @@
class
<<
self
def
all_dashboard_paths
(
_project
)
[{
path:
SYSTEM_
DASHBOARD_PATH
,
display_name:
SYSTEM_
DASHBOARD_NAME
,
path:
DASHBOARD_PATH
,
display_name:
DASHBOARD_NAME
,
default:
true
,
system_dashboard:
true
}]
end
...
...
@@ -23,32 +23,7 @@
default:
true
,
system_dashboard:
true
}]
end
def
system_dashboard?
(
filepath
)
filepath
==
SYSTEM_DASHBOARD_PATH
end
end
private
def
cache_key
"metrics_dashboard_
#{
dashboard_path
}
"
end
def
dashboard_path
SYSTEM_DASHBOARD_PATH
end
# Returns the base metrics shipped with every GitLab service.
def
get_raw_dashboard
yml
=
File
.
read
(
Rails
.
root
.
join
(
dashboard_path
))
YAML
.
safe_load
(
yml
)
end
def
sequence
SEQUENCE
end
end
end
...
...
app/views/projects/environments/folder.html.haml
View file @
36d4821c
-
page_title
_
(
"Environments"
)
-
add_to_breadcrumbs
_
(
"Environments"
),
project_environments_path
(
@project
)
-
breadcrumb_title
_
(
"Folder/%{name}"
)
%
{
name:
@folder
}
-
page_title
_
(
"Environments in %{name}"
)
%
{
name:
@folder
}
#environments-folder-list-view
{
data:
{
environments_data:
environments_folder_list_view_data
}
}
changelogs/unreleased/32470-ui-degradation-on-environment-folder-view.yml
0 → 100644
View file @
36d4821c
---
title
:
Fix broken UI on Environment folder
merge_request
:
17427
author
:
Takuya Noguchi
type
:
fixed
changelogs/unreleased/expose_moved_to_in_issues_api.yml
0 → 100644
View file @
36d4821c
---
title
:
Expose moved_to_id in issues API
merge_request
:
20083
author
:
Lee Tickett
type
:
added
changelogs/unreleased/remove_build_badge_path_from_route.yml
0 → 100644
View file @
36d4821c
---
title
:
Remove build badge path from route
merge_request
:
20188
author
:
Lee Tickett
type
:
other
config/routes/project.rb
View file @
36d4821c
...
...
@@ -494,8 +494,6 @@
collection
do
scope
'*ref'
,
constraints:
{
ref:
Gitlab
::
PathRegex
.
git_reference_regex
}
do
constraints
format:
/svg/
do
# Keep around until 10.0, see gitlab-org/gitlab-ce#35307
get
:build
,
to:
"badges#pipeline"
get
:pipeline
get
:coverage
end
...
...
danger/changes_size/Dangerfile
View file @
36d4821c
# FIXME: git.info_for_file raises the following error
# /usr/local/bundle/gems/git-1.4.0/lib/git/lib.rb:956:in `command': (Danger::DSLError)
# [!] Invalid `Dangerfile` file:
# [!] Invalid `Dangerfile` file: git '--git-dir=/builds/gitlab-org/gitlab
-foss
/.git' '--work-tree=/builds/gitlab-org/gitlab
-foss
' cat-file '-t' '' 2>&1:fatal: Not a valid object name
# [!] Invalid `Dangerfile` file: git '--git-dir=/builds/gitlab-org/gitlab/.git' '--work-tree=/builds/gitlab-org/gitlab' cat-file '-t' '' 2>&1:fatal: Not a valid object name
# This seems to be the same as https://github.com/danger/danger/issues/535.
# locale_files_updated = git.modified_files.select { |path| path.start_with?('locale') }
...
...
danger/database/Dangerfile
View file @
36d4821c
...
...
@@ -20,7 +20,7 @@
1. Ensure the merge request has ~database and ~"database::review pending" labels.
If the merge request modifies database files, Danger will do this for you.
1. Use the [Database changes checklist](https://gitlab.com/gitlab-org/gitlab
-foss
/blob/master/.gitlab/merge_request_templates/Database%20changes.md)
1. Use the [Database changes checklist](https://gitlab.com/gitlab-org/gitlab/blob/master/.gitlab/merge_request_templates/Database%20changes.md)
template or add the appropriate items to the MR description.
1. Assign and mention the database reviewer suggested by Reviewer Roulette.
MSG
...
...
danger/roulette/Dangerfile
View file @
36d4821c
...
...
@@ -27,7 +27,7 @@
These files couldn't be categorised, so Danger was unable to suggest a reviewer.
Please consider creating a merge request to
[add support](https://gitlab.com/gitlab-org/gitlab
-foss
/blob/master/lib/gitlab/danger/helper.rb)
[add support](https://gitlab.com/gitlab-org/gitlab/blob/master/lib/gitlab/danger/helper.rb)
for them.
MARKDOWN
...
...
@@ -46,7 +46,7 @@
end
# TODO: take CODEOWNERS into account?
# https://gitlab.com/gitlab-org/gitlab
-foss
/issues/
5765
3
# https://gitlab.com/gitlab-org/gitlab/issues/
2672
3
# Make traintainers have triple the chance to be picked as a reviewer
reviewer
=
roulette
.
spin_for_person
(
reviewers
+
traintainers
+
traintainers
,
random:
random
)
...
...
doc/api/issues.md
View file @
36d4821c
...
...
@@ -113,6 +113,7 @@
"id"
:
76
,
"title"
:
"Consequatur vero maxime deserunt laboriosam est voluptas dolorem."
,
"created_at"
:
"2016-01-04T15:31:51.081Z"
,
"moved_to_id"
:
null
,
"iid"
:
6
,
"labels"
:
[
"foo"
,
"bar"
],
"upvotes"
:
4
,
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
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