Commits · ee0a972bb3bca1ece4fe263aa7e9a0f01222e585 · nexedi / gitlab-ce

26 Apr, 2021 40 commits
- Merge branch 'cherry-pick-4c761206' into 'master' · ee0a972b
  Markus Koller authored Apr 26, 2021
```
Provide a column to grouped COUNT query

See merge request gitlab-org/gitlab!59897
```
  ee0a972b
- Merge branch '273626-add-popover-with-more-info-but-no-ctas' into 'master' · 81bbb111
  Mark Florian authored Apr 26, 2021
```
Highlight paid features during active trial - Part 3

See merge request gitlab-org/gitlab!58827
```
  81bbb111
- Show popover with more info on hover of paid feature highlight badge · bee8f13c
  Dallas Reedy authored Apr 26, 2021
```
- Add popover component with more details about the paid feature being
  highlighted
- Track an event whenever the popover is shown
- Do not show the popover on smaller screen sizes
- Only show the tooltip on smaller screen sizes
```
  bee8f13c
- Merge branch '325182_03_help_pages' into 'master' · 60f380c8
  Olena Horal-Koretska authored Apr 26, 2021
```
Geo Node Status 2.0 - helpPagePath Cleanup

See merge request gitlab-org/gitlab!60164
```
  60f380c8
- Merge branch 'remove-json-schemer-gem' into 'master' · 1ad243d2
  Alex Kalderimis authored Apr 26, 2021
```
Stop using json shema gem in test [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!58661
```
  1ad243d2
- Stop using json shema gem in test [RUN AS-IF-FOSS] · 53cdadc0
  Can Eldem authored Apr 26, 2021
  
  53cdadc0
- Merge branch '323357-mlunoe-clean-up-buy-minutes-seed-query' into 'master' · 5dbbabc4
  Olena Horal-Koretska authored Apr 26, 2021
```
Clean up initial data parsing in /buy_minutes route

See merge request gitlab-org/gitlab!59660
```
  5dbbabc4
- Clean up initial data parsing in /buy_minutes route · 87c15fb7
  Michael Lunøe authored Apr 26, 2021
  
  87c15fb7
- Merge branch 'rename-license-cloud-method' into 'master' · afd2b31f
  Nick Thomas authored Apr 26, 2021
```
Rename License#cloud? to License#cloud_license?

See merge request gitlab-org/gitlab!60065
```
  afd2b31f
- Merge branch 'pl-rubocop-todo-where-equals' into 'master' · 6abd47a3
  Heinrich Lee Yu authored Apr 26, 2021
```
Resolves rubocop offense Rails/WhereEquals [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!58067
```
  6abd47a3
- Merge branch 'requirements_issue_type' into 'master' · 069e23b1
  Heinrich Lee Yu authored Apr 26, 2021
```
Add new issue type for requirements

See merge request gitlab-org/gitlab!59868
```
  069e23b1
- Add new issue type for requirements · 0617fb47
  Jan Provaznik authored Apr 26, 2021
  
  0617fb47
- Merge branch '327439-quarantine-flaky-test' into 'master' · bd1e4e0a
  Sean McGivern authored Apr 26, 2021
```
Quarantine a flaky test

See merge request gitlab-org/gitlab!60260
```
  bd1e4e0a
- Merge branch 'pl-rubocop-todo-rescue-standard-error' into 'master' · 78ffbe8f
  Rémy Coutable authored Apr 26, 2021
```
Resolves rubocop offense Style/RescueStandardError

See merge request gitlab-org/gitlab!57923
```
  78ffbe8f
- Resolves rubocop offense Style/RescueStandardError · e1acca6e
  Shubham Kumar authored Apr 26, 2021
  
  e1acca6e
- Merge branch 'refactor-notes-actions' into 'master' · 706f11df
  Phil Hughes authored Apr 26, 2021
```
Use Poll-based axios request even on one-shot request in note actions.js

See merge request gitlab-org/gitlab!59656
```
  706f11df
- Merge branch 'Externalize-strings-in-_signin.html.haml' into 'master' · 1e2fbc86
  Rémy Coutable authored Apr 26, 2021
```
Externalize strings in  application_settings/_signin.html.haml

See merge request gitlab-org/gitlab!58066
```
  1e2fbc86
- Externalize strings in application_settings/_signin.html.haml · c3f83d1b
  Marvin Karegyeya authored Apr 26, 2021
  
  c3f83d1b
- Merge branch 'renovate/eslint-and-related' into 'master' · 1fa2baed
  Vitaly Slobodin authored Apr 26, 2021
```
Update dependency eslint to v7.25.0

See merge request gitlab-org/gitlab!60224
```
  1fa2baed
- Merge branch '2608-monitor-ff-removal' into 'master' · ba190a7b
  Vitali Tatarintev authored Apr 26, 2021
```
Feature flag removal [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!60053
```
  ba190a7b
- Feature flag removal [RUN ALL RSPEC] [RUN AS-IF-FOSS] · cf304e10
  David O'Regan authored Apr 26, 2021
  
  cf304e10
- Merge branch '327487-enable-by-default' into 'master' · 469c14e1
  Arturo Herrero authored Apr 26, 2021
```
Enable `check_maven_path_first` by default

See merge request gitlab-org/gitlab!60142
```
  469c14e1
- Enable `check_maven_path_first` by default · 0058066c
  David Fernandez authored Apr 26, 2021
  
  0058066c
- Merge branch '321812-sla-metrics' into 'master' · f162e16e
  Rémy Coutable authored Apr 26, 2021
```
Update Usage Ping Metrics - SLA

See merge request gitlab-org/gitlab!60047
```
  f162e16e
- Merge branch 'docs-explain-missing-.ssh-directory' into 'master' · ea96b1d0
  Marcin Sedlak-Jakubowski authored Apr 26, 2021
```
Docs explain how Windows and Powershell works fine for git

See merge request gitlab-org/gitlab!57459
```
  ea96b1d0
- Docs explain how Windows and Powershell works fine for git · 453224f7
  Ruben ten Hove authored Apr 26, 2021
  
  453224f7
- Merge branch 'pl-rubocop-todo-redundant-begin' into 'master' · a2e5e1f4
  Rémy Coutable authored Apr 26, 2021
```
Resolves rubocop offense Style/RedundantBegin

See merge request gitlab-org/gitlab!58017
```
  a2e5e1f4
- Merge branch 'rails-save-bang-frontend' into 'master' · ac7a6af6
  Rémy Coutable authored Apr 26, 2021
```
Fix Rails/SaveBang offenses in spec/frontend

See merge request gitlab-org/gitlab!57909
```
  ac7a6af6
- Fix Rails/SaveBang offenses in spec/frontend · 72985742
  Abdul Wadood authored Apr 26, 2021
  
  72985742
- Merge branch 'rails-save-bang-ee-spec-workers' into 'master' · dc8e6a8a
  Rémy Coutable authored Apr 26, 2021
```
Fix Rails/SaveBang offenses in ee/spec/workers

See merge request gitlab-org/gitlab!58070
```
  dc8e6a8a
- Fix Rails/SaveBang offenses in ee/spec/workers · 9ec9fb6a
  Abdul Wadood authored Apr 26, 2021
  
  9ec9fb6a
- Merge branch 'docs/service_jenkins_api_doc' into 'master' · 24be4573
  Alex Kalderimis authored Apr 26, 2021
```
Doc: add event params for Jenkins CI service API

See merge request gitlab-org/gitlab!59990
```
  24be4573
- Doc: add event params for Jenkins CI service API · 0890d3a2
  Andy Soiron authored Apr 26, 2021
  
  0890d3a2
- Resolves rubocop offense Rails/WhereEquals · d509f0e1
  Shubham Kumar authored Mar 31, 2021
```
Fixes auto correct rubocop offenses
```
  d509f0e1
- Merge branch 'Externalize-strings-in-_usage.html.haml' into 'master' · e84afd31
  Phil Hughes authored Apr 26, 2021
```
Externalise strings in application_settings/_usage.html.haml

See merge request gitlab-org/gitlab!58088
```
  e84afd31
- Externalise strings in application_settings/_usage.html.haml · 580618dc
  Marvin Karegyeya authored Apr 26, 2021
  
  580618dc
- Merge branch 'Externalize-strings-in-edite.html.haml' into 'master' · 30b022a0
  Phil Hughes authored Apr 26, 2021
```
Externalise strings in users/edit.html.haml

See merge request gitlab-org/gitlab!58117
```
  30b022a0
- Externalise strings in users/edit.html.haml · 86517314
  Marvin Karegyeya authored Apr 26, 2021
  
  86517314
- Merge branch 'Externalize-strings-in-unlock_instructions.text.erb' into 'master' · 734ed2c8
  Bob Van Landuyt authored Apr 26, 2021
```
Externalize strings in unlock_instructions.text.erb

See merge request gitlab-org/gitlab!58229
```
  734ed2c8
- Externalize strings in unlock_instructions.text.erb · 5bca157e
  Marvin Karegyeya authored Apr 26, 2021
  
  5bca157e