kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add latest changes from gitlab-org/gitlab@master

Browse source
This commit is contained in:
GitLab Bot 2021-03-29 03:09:08 +00:00
parent 4ca7380c7c
commit 4535b534a8
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/development/database_debugging.md
View file

@ -29,10 +29,10 @@ If you just want to delete everything and start over with sample data (approxima
also does `db:reset` and runs DB-specific migrations:
```shell
bundle exec rake dev:setup RAILS_ENV=development
bundle exec rake db:setup RAILS_ENV=development
```
If your test DB is giving you problems, it is safe to nuke it because it doesn't contain important
If your test DB is giving you problems, it is safe to delete everything because it doesn't contain important
data:
```shell

6
doc/subscriptions/gitlab_com/index.md
View file

@ -15,9 +15,9 @@ This page reviews the details of your GitLab SaaS subscription.
## Choose a GitLab SaaS tier
Pricing is [tier-based](https://about.gitlab.com/pricing/), allowing you to choose
the features which fit your budget. For information on what features are available
at each tier, see the
Pricing is [tier-based](https://about.gitlab.com/pricing/), so you can choose
the features that fit your budget. For information on the features available
for each tier, see the
[GitLab SaaS feature comparison](https://about.gitlab.com/pricing/gitlab-com/feature-comparison/).
## Choose the number of users

8
doc/subscriptions/self_managed/index.md
View file

@ -28,11 +28,11 @@ The cost of a GitLab self-managed subscription is determined by the following:
- GitLab tier
- Subscription seats
## GitLab tier
## Choose a GitLab tier
Pricing is [tier-based](https://about.gitlab.com/pricing/), allowing you to choose
the features which fit your budget. For information on what features are available
at each tier, see the
Pricing is [tier-based](https://about.gitlab.com/pricing/), so you can choose
the features that fit your budget. For information on the features available
for each tier, see the
[GitLab self-managed feature comparison](https://about.gitlab.com/pricing/self-managed/feature-comparison/).
## Subscription seats

2
spec/views/registrations/welcome/show.html.haml_spec.rb
View file

@ -11,7 +11,7 @@ RSpec.describe 'registrations/welcome/show' do
allow(view).to receive(:current_user).and_return(user)
allow(view).to receive(:in_subscription_flow?).and_return(false)
allow(view).to receive(:in_trial_flow?).and_return(false)
allow(view).to receive(:in_invitation_flow?).and_return(false)
allow(view).to receive(:user_has_memberships?).and_return(false)
allow(view).to receive(:in_oauth_flow?).and_return(false)
allow(Gitlab).to receive(:com?).and_return(false)