Commits · b884693d0795a82a8828c8de2415d6251c04802b · nexedi / gitlab-ce

22 Apr, 2021 40 commits
- Edit and remove images in Alerts doc · b884693d
  Nick Gaskill authored Apr 22, 2021
  
  b884693d
- Merge branch 'docs-incoming-email-tier' into 'master' · 096ef265
  Marcin Sedlak-Jakubowski authored Apr 22, 2021
```
Add Free tier badge to Incoming email page

See merge request gitlab-org/gitlab!59927
```
  096ef265
- Merge branch 'docs-labels-free-tier' into 'master' · 41d18ebb
  Marcin Sedlak-Jakubowski authored Apr 22, 2021
```
Add Free tier to Labels page

See merge request gitlab-org/gitlab!60000
```
  41d18ebb
- Merge branch '323181-hide-renew-button-for-trail-subscriptions' into 'master' · d809683e
  Vitaly Slobodin authored Apr 22, 2021
```
Hide "Renew" button for trial subscription on group billing page

See merge request gitlab-org/gitlab!55796
```
  d809683e
- Hide "Renew" button for trial subscription on group billing page · cc32d425
  Kev authored Apr 22, 2021
  
  cc32d425
- Add Free tier to Labels page · 8e2d58dc
  Craig Norris authored Apr 22, 2021
```
Add Free tier badge to Labels doc page.
```
  8e2d58dc
- Merge branch 'gl-badge-badges' into 'master' · 280776b4
  Olena Horal-Koretska authored Apr 22, 2021
```
Move badge to vue component in project badges

See merge request gitlab-org/gitlab!58045
```
  280776b4
- Move badge to vue component in project badges · 869b425b
  Yogi authored Apr 22, 2021
  
  869b425b
- Merge branch 'pb-move-artifacts-to-ellipsis-dropdown' into 'master' · a0fdf1ba
  Mark Florian authored Apr 22, 2021
```
Build pipeline mutli action dropdown

See merge request gitlab-org/gitlab!59667
```
  a0fdf1ba
- Merge branch 'afontaine/alert-users-when-deleting-deploy-keys' into 'master' · 7962ee89
  Enrique Alcántara authored Apr 22, 2021
```
Migrate Deploy Keys Confirmation Modal to GitLab UI

See merge request gitlab-org/gitlab!59697
```
  7962ee89
- Migrate Deploy Keys Confirmation Modal to GitLab UI · 782e6e37
  Andrew Fontaine authored Apr 22, 2021
  
  782e6e37
- Merge branch 'dblessing_cascading_override' into 'master' · f3824cea
  Sean McGivern authored Apr 22, 2021
```
Fix cascading settings attr writer behavior

See merge request gitlab-org/gitlab!59910
```
  f3824cea
- Fix cascading settings attr writer behavior · 5c4f6a73
  Drew Blessing authored Apr 22, 2021
```
If set value matches the cascaded value, do not save locally.
This fixes an issue where a simple settings form save by a subgroup
would cause a cascaded value to be saved at the subgroup level,
defeating future cascading lookups. Also, when setting a lock
attribute and the local setting is `nil`, copy the value locally to
ensure ancestors can't change the intended value for subgroups later.

Changelog: fixed
```
  5c4f6a73
- Merge branch 'Externalize-strings-in-viewers/_license.html.haml' into 'master' · f9211fe6
  Heinrich Lee Yu authored Apr 22, 2021
```
Externalize strings in viewers/_license.html.haml

See merge request gitlab-org/gitlab!58452
```
  f9211fe6
- Externalize strings in viewers/_license.html.haml · 7e3dfa6b
  Marvin Karegyeya authored Apr 22, 2021
  
  7e3dfa6b
- Merge branch '296823-remove-ondemandscansapp-component' into 'master' · dad4d6d5
  Mark Florian authored Apr 22, 2021
```
Remove OnDemandScansApp component

See merge request gitlab-org/gitlab!59287
```
  dad4d6d5
- Merge branch '327686-update-mr-widget-specs' into 'master' · 02c91aec
  Brandon Labuschagne authored Apr 22, 2021
```
Update default branch name in mr_widget specs

See merge request gitlab-org/gitlab!59860
```
  02c91aec
- Merge branch '327686-update-environments-table-specs' into 'master' · 0927b183
  Mark Florian authored Apr 22, 2021
```
Update default branch name in environments specs

See merge request gitlab-org/gitlab!59850
```
  0927b183
- Merge branch 'jswain_empty_repo_upload_tracking' into 'master' · 998830c0
  Nick Thomas authored Apr 22, 2021
```
Extract commit count logic to use elsewhere

See merge request gitlab-org/gitlab!59713
```
  998830c0
- Update master to main · 1b99e5bf
  Jacques Erasmus authored Apr 21, 2021
```
Updated the default branch
```
  1b99e5bf
- Merge branch 'docs/gb/graphql-blueprint-mvc' into 'master' · 912665e9
  Darva Satcher authored Apr 22, 2021
```
Reduce the scope of the GraphQL API blueprint

See merge request gitlab-org/gitlab!59873
```
  912665e9
- Merge branch '327648-group-project-members-migrate-pagination-to-vue' into 'master' · dd5bb1d4
  Vitaly Slobodin authored Apr 22, 2021
```
Refactor members pagination from HAML to Vue

See merge request gitlab-org/gitlab!59707
```
  dd5bb1d4
- Refactor members pagination from HAML to Vue · d3edd8d9
  Peter Hegman authored Apr 22, 2021
  
  d3edd8d9
- Merge branch '327814-allow-project-owner-as-member' into 'master' · 61dd1268
  Sean McGivern authored Apr 22, 2021
```
Allow ProjectMembers who are owners to have permissions

See merge request gitlab-org/gitlab!59844
```
  61dd1268
- Merge branch '220482-use-global-vue-instance-in-approvals-spec' into 'master' · e3a9e040
  Phil Hughes authored Apr 22, 2021
```
Use global Vue instance in frontend specs

See merge request gitlab-org/gitlab!59767
```
  e3a9e040
- Merge branch 'gl-form-issue-template' into 'master' · 088b5670
  Miguel Rincon authored Apr 22, 2021
```
Add gl-form-input for project issue template settings

See merge request gitlab-org/gitlab!58046
```
  088b5670
- Add gl-form-input for project issue template settings · bf5a265d
  Yogi authored Apr 22, 2021
  
  bf5a265d
- Merge branch '327686-update-pipelines-specs' into 'master' · 12393cb8
  Miguel Rincon authored Apr 22, 2021
```
Update default branch name in pipelines specs

See merge request gitlab-org/gitlab!59853
```
  12393cb8
- Merge branch 'content-editor-remove-markdown-it-from-build' into 'master' · c186df87
  Martin Wortschack authored Apr 22, 2021
```
Remove Markdown-it from Content Editor build

See merge request gitlab-org/gitlab!59891
```
  c186df87
- Merge branch '321812-grafana-metrics' into 'master' · 2bfd8dc9
  Vitali Tatarintev authored Apr 22, 2021
```
Update Usage Ping Metrics Definitions - Grafana metrics

See merge request gitlab-org/gitlab!59928
```
  2bfd8dc9
- Merge branch '21107-optimize-sql-queries-in-settings-ci-cd-controller' into 'master' · bc513a5d
  Vitali Tatarintev authored Apr 22, 2021
```
Preload Ci::Runner tags to prevent N+1 queries [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!59625
```
  bc513a5d
- Merge branch 'ajk-linked-graphql-docs-with-args' into 'master' · 00e709db
  charlie ablett authored Apr 22, 2021
```
Linked GraphQL docs output

See merge request gitlab-org/gitlab!55944
```
  00e709db
- Merge branch '296520_improve_merge_reports_service' into 'master' · 12476cb9
  Markus Koller authored Apr 22, 2021
```
Improve MergeReportsService

See merge request gitlab-org/gitlab!59682
```
  12476cb9
- Make MergeReportsService reliable · 87508599
  Mehmet Emin INAC authored Apr 22, 2021
```
We should sort each finding individually to make the result of merge
result reliable.
```
  87508599
- Merge branch '328519-fix-timeouts-when-paginating-issues-in-admin-panel' into 'master' · 2522d750
  Dmitry Gruzd authored Apr 22, 2021
```
Improve pagination of users in admin panel

See merge request gitlab-org/gitlab!59884
```
  2522d750
- Add spec for Graphql project members · 7bcc2ff0
  Sean Arnold authored Apr 22, 2021
  
  7bcc2ff0
- Allow project members who are owners permissions · c35277ca
  Sean Arnold authored Apr 21, 2021
```
Changelog: fixed
```
  c35277ca
- Merge branch 'typo-no-contributions' into 'master' · bb4269d4
  Rémy Coutable authored Apr 22, 2021
```
Rename 'no contributions' to 'No contributions' in profile activity graph helper

See merge request gitlab-org/gitlab!59076
```
  bb4269d4
- Rename 'no contributions' to 'No contributions' in profile activity graph helper · ad1a77f0
  Yogi authored Apr 22, 2021
  
  ad1a77f0
- Merge branch 'refactor-billable-membership-entity' into 'master' · 9a304d3a
  Vitali Tatarintev authored Apr 22, 2021
```
Extract Routing Logic from BillableMembership Entity

See merge request gitlab-org/gitlab!59412
```
  9a304d3a