Skip to content
Snippets Groups Projects
Unverified Commit 9cee7494 authored by Balasankar C's avatar Balasankar C
Browse files

Replace references of gitlab-org/gitlab-ce to gitlab-org/gitlab-foss


Not replacing issue references are closed issues won't be moved.

Signed-off-by: default avatarBalasankar "Balu" C <balasankar@gitlab.com>
parent 98d2f182
No related branches found
No related tags found
No related merge requests found
Showing
with 35 additions and 35 deletions
Loading
Loading
@@ -23,7 +23,7 @@ _This notice should stay as the first item in the CONTRIBUTING.md file._
 
## Definition of done
 
The omnibus-gitlab project uses the [definition of done as noted in GitLab Community Edition (and Enterprise Edition)](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/contributing/merge_request_workflow.md#definition-of-done).
The omnibus-gitlab project uses the [definition of done as noted in GitLab Community Edition (and Enterprise Edition)](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/doc/development/contributing/merge_request_workflow.md#definition-of-done).
 
As this project is a wrapper around GitLab CE/EE, some additions to the definition apply:
 
Loading
Loading
Loading
Loading
@@ -231,7 +231,7 @@ If you are using non-packaged database see [documentation on using non-packaged
 
### Upload backups to remote (cloud) storage
 
For details check [backup restore document of GitLab CE](https://gitlab.com/gitlab-org/gitlab-ce/blob/966f68b33e1f15f08e383ec68346ed1bd690b59b/doc/raketasks/backup_restore.md#upload-backups-to-remote-cloud-storage).
For details check [backup restore document of GitLab CE](https://gitlab.com/gitlab-org/gitlab-foss/blob/966f68b33e1f15f08e383ec68346ed1bd690b59b/doc/raketasks/backup_restore.md#upload-backups-to-remote-cloud-storage).
 
## Invoking Rake tasks
 
Loading
Loading
@@ -320,9 +320,9 @@ This omnibus installer project is based on the awesome work done by Chef in
[omnibus-chef-server][omnibus-chef-server].
 
[downloads]: https://about.gitlab.com/downloads/
[CE README]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/README.md
[CE README]: https://gitlab.com/gitlab-org/gitlab-foss/blob/master/README.md
[omnibus-chef-server]: https://github.com/opscode/omnibus-chef-server
[database.yml.mysql]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/database.yml.mysql
[database.yml.mysql]: https://gitlab.com/gitlab-org/gitlab-foss/blob/master/config/database.yml.mysql
[svlogd]: http://smarden.org/runit/svlogd.8.html
[installation]: https://about.gitlab.com/install/
[gitlab.rb.template]: https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-config-template/gitlab.rb.template
Loading
Loading
@@ -21,12 +21,12 @@ name 'git'
# When updating the git version here, but sure to also update the following:
# - https://gitlab.com/gitlab-org/gitaly/blob/master/README.md#installation
# - https://gitlab.com/gitlab-org/gitaly/blob/master/.gitlab-ci.yml
# - https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md
# - https://gitlab.com/gitlab-org/gitlab-foss/blob/master/doc/install/installation.md
# - https://gitlab.com/gitlab-org/gitlab-recipes/blob/master/install/centos/README.md
# - https://gitlab.com/gitlab-org/gitlab-development-kit/blob/master/doc/prepare.md
# - https://gitlab.com/gitlab-org/gitlab-build-images/blob/master/.gitlab-ci.yml
# - https://gitlab.com/gitlab-org/gitlab-ce/blob/master/.gitlab-ci.yml
# - https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/system_check/app/git_version_check.rb
# - https://gitlab.com/gitlab-org/gitlab-foss/blob/master/.gitlab-ci.yml
# - https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/system_check/app/git_version_check.rb
# - https://gitlab.com/gitlab-org/build/CNG/blob/master/ci_files/variables.yml
default_version '2.22.0'
 
Loading
Loading
Loading
Loading
@@ -404,7 +404,7 @@ command, it is only for GitLab installations from source.
 
The GitLab web interface uses CSS and JavaScript files, called 'assets' in Ruby
on Rails-speak. In the [upstream GitLab
repository](https://gitlab.com/gitlab-org/gitlab-ce/tree/master/app/assets)
repository](https://gitlab.com/gitlab-org/gitlab-foss/tree/master/app/assets)
these files are stored in a developer-friendly way: easy to read and edit. When
you are a normal user of GitLab, you do not want these files to be in the
developer friendly format however because that makes GitLab slow. This is why
Loading
Loading
Loading
Loading
@@ -48,6 +48,6 @@ Omnibus GitLab package.
and thus should be checked for how it is used as a part of the Omnibus GitLab package
to ensure compliance.
 
This list is currently sourced from the [GitLab development documentation on licensing](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/licensing.md).
This list is currently sourced from the [GitLab development documentation on licensing](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/doc/development/licensing.md).
However, due to the nature of the Omnibus GitLab package the licenses may not apply
in the same way. Such as with `git` and `rsync`. See the [GNU License FAQ](https://www.gnu.org/licenses/gpl-faq.en.html#MereAggregation)
Loading
Loading
@@ -109,6 +109,6 @@ what was noted above:
This method is useful for organizations just getting started with containers and schedulers, and may not be ready for a more complex installation. This method is a great introduction, and will work well for smaller organizations.
 
[GitLab Architecture Overview]: https://docs.gitlab.com/ce/development/architecture.html#gitlab-architecture-overview
[rubygems]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/Gemfile.lock
[rubygems]: https://gitlab.com/gitlab-org/gitlab-foss/blob/master/Gemfile.lock
[non-bundled PG database]: https://docs.gitlab.com/omnibus/settings/database.html#using-a-non-packaged-postgresql-database-management-server
[GitLab Docker image]: https://docs.gitlab.com/omnibus/docker/README.html#gitlab-docker-images
Loading
Loading
@@ -111,7 +111,7 @@ If you stumble upon any issues, see the [troubleshooting section](#relative-url-
 
If you notice any issues with GitLab assets appearing broken after moving to a
relative url configuration (like missing images or unresponsive components)
please raise an issue in [GitLab CE](https://gitlab.com/gitlab-org/gitlab-ce)
please raise an issue in [GitLab CE](https://gitlab.com/gitlab-org/gitlab-foss)
with the `Frontend` label.
 
If you are running a version _prior to 8.17_ and for some reason the asset
Loading
Loading
@@ -626,7 +626,7 @@ details.
GitLab 12.2 added support for [CSP and nonces with inline
JavaScript](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/script-src).
It is [not configured on by default
yet](https://gitlab.com/gitlab-org/gitlab-ce/issues/65675). An example
yet](https://gitlab.com/gitlab-org/gitlab-foss/issues/65675). An example
configuration that will work for most installations of GitLab is below:
 
```ruby
Loading
Loading
# Changing `gitlab.yml` and application.yml settings
 
Some of GitLab's features can be customized through
[`gitlab.yml`](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example). If you want to change a `gitlab.yml` setting
[`gitlab.yml`](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/config/gitlab.yml.example). If you want to change a `gitlab.yml` setting
with Omnibus GitLab, you need to do so via `/etc/gitlab/gitlab.rb`. The
translation works as follows. For a complete list of available options, visit the
[`gitlab.rb.template`](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-config-template/gitlab.rb.template).
Loading
Loading
@@ -41,5 +41,5 @@ Don't forget to update the following 3 files when adding a new setting:
file to expose the setting to the end user via `/etc/gitlab/gitlab.rb`.
- the [`default.rb`](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/attributes/default.rb)
file to provide a sane default for the new setting.
- the [`gitlab.yml.example`](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example)
- the [`gitlab.yml.example`](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/config/gitlab.yml.example)
file to actually use the setting's value from `gitlab.rb`.
Loading
Loading
@@ -8,7 +8,7 @@ For GitLab Community Edition:
 
```ruby
# These settings are documented in more detail at
# https://gitlab.com/gitlab-org/gitlab-ce/blob/a0a826ebdcb783c660dd40d8cb217db28a9d4998/config/gitlab.yml.example#L136
# https://gitlab.com/gitlab-org/gitlab-foss/blob/a0a826ebdcb783c660dd40d8cb217db28a9d4998/config/gitlab.yml.example#L136
# Be careful not to break the identation in the ldap_servers block. It is in
# yaml format and the spaces must be retained. Using tabs will not work.
 
Loading
Loading
Loading
Loading
@@ -489,7 +489,7 @@ This inserts the defined string into the end of the `server` block of
 
in the string or in the included NGINX config. Without these, any sub-location
will return a 404. See
[GitLab CE Issue #30619](https://gitlab.com/gitlab-org/gitlab-ce/issues/30619).
[GitLab CE Issue #30619](https://gitlab.com/gitlab-org/gitlab-foss/issues/30619).
- You cannot add the root `/` location or the `/assets` location as those already
exist in `gitlab-http.conf`.
 
Loading
Loading
@@ -790,7 +790,7 @@ Starting with GitLab 10, the Omnibus GitLab package no longer supports TLSv1 pro
This can cause connection issues with some older Java based IDE clients when interacting with
your GitLab instance.
We strongly urge you to upgrade ciphers on your server, similar to what was mentioned
in [this user comment](https://gitlab.com/gitlab-org/gitlab-ce/issues/624#note_299061).
in [this user comment](https://gitlab.com/gitlab-org/gitlab-foss/issues/624#note_299061).
 
If it is not possible to make this server change, you can default back to the old
behavior by changing the values in your `/etc/gitlab/gitlab.rb`:
Loading
Loading
Loading
Loading
@@ -9,7 +9,7 @@ unicorn['worker_processes'] = 3
unicorn['worker_timeout'] = 60
```
 
NOTE: **Note:** Minimum required `worker_processes` is 2 in order for the web editor to work correctly, see [GitLab CE issue #18771](https://gitlab.com/gitlab-org/gitlab-ce/issues/18771) for details.
NOTE: **Note:** Minimum required `worker_processes` is 2 in order for the web editor to work correctly, see [GitLab CE issue #18771](https://gitlab.com/gitlab-org/gitlab-foss/issues/18771) for details.
 
CAUTION: **Caution:** Be sure to review [recommended number of Unicorn Workers](https://docs.gitlab.com/ee/install/requirements.html#unicorn-workers)
before changing.
Loading
Loading
@@ -733,7 +733,7 @@ external_url 'GENERATED_EXTERNAL_URL'
# unicorn['enable'] = true
# unicorn['worker_timeout'] = 60
###! Minimum worker_processes is 2 at this moment
###! See https://gitlab.com/gitlab-org/gitlab-ce/issues/18771
###! See https://gitlab.com/gitlab-org/gitlab-foss/issues/18771
# unicorn['worker_processes'] = 2
 
### Advanced settings
Loading
Loading
Loading
Loading
@@ -50,7 +50,7 @@ node.default['gitaly']['env'] = {
# This is needed by gitlab-markup to import Python docutils
'PYTHONPATH' => "#{node['package']['install-dir']}/embedded/lib/python3.7/site-packages",
# Charlock Holmes and libicu will report U_FILE_ACCESS_ERROR if this is not set to the right path
# See https://gitlab.com/gitlab-org/gitlab-ce/issues/17415#note_13868167
# See https://gitlab.com/gitlab-org/gitlab-foss/issues/17415#note_13868167
'ICU_DATA' => "#{node['package']['install-dir']}/embedded/share/icu/current",
'SSL_CERT_DIR' => "#{node['package']['install-dir']}/embedded/ssl/certs/",
# wrapper script parameters
Loading
Loading
Loading
Loading
@@ -68,7 +68,7 @@ default['gitlab']['gitlab-rails']['env'] = {
# defaults to /opt/gitlab/embedded/bin:/bin:/usr/bin. The install-dir path is set at build time
'PATH' => "#{node['package']['install-dir']}/bin:#{node['package']['install-dir']}/embedded/bin:/bin:/usr/bin",
# Charlock Holmes and libicu will report U_FILE_ACCESS_ERROR if this is not set to the right path
# See https://gitlab.com/gitlab-org/gitlab-ce/issues/17415#note_13868167
# See https://gitlab.com/gitlab-org/gitlab-foss/issues/17415#note_13868167
'ICU_DATA' => "#{node['package']['install-dir']}/embedded/share/icu/current",
'PYTHONPATH' => "#{node['package']['install-dir']}/embedded/lib/python3.7/site-packages",
# Prevent ExecJS from complaining that Node is not installed in production
Loading
Loading
@@ -146,7 +146,7 @@ default['gitlab']['gitlab-rails']['artifacts_path'] = nil
default['gitlab']['gitlab-rails']['artifacts_object_store_enabled'] = false
default['gitlab']['gitlab-rails']['artifacts_object_store_direct_upload'] = false
# TODO: Deprecate once direct upload is implemented
# https://gitlab.com/gitlab-org/gitlab-ce/issues/57372
# https://gitlab.com/gitlab-org/gitlab-foss/issues/57372
default['gitlab']['gitlab-rails']['artifacts_object_store_background_upload'] = true
default['gitlab']['gitlab-rails']['artifacts_object_store_proxy_download'] = false
default['gitlab']['gitlab-rails']['artifacts_object_store_remote_directory'] = 'artifacts'
Loading
Loading
@@ -157,7 +157,7 @@ default['gitlab']['gitlab-rails']['external_diffs_storage_path'] = nil
default['gitlab']['gitlab-rails']['external_diffs_object_store_enabled'] = false
default['gitlab']['gitlab-rails']['external_diffs_object_store_direct_upload'] = false
# TODO: Deprecate once direct upload is implemented
# https://gitlab.com/gitlab-org/gitlab-ce/issues/57372
# https://gitlab.com/gitlab-org/gitlab-foss/issues/57372
default['gitlab']['gitlab-rails']['external_diffs_object_store_background_upload'] = true
default['gitlab']['gitlab-rails']['external_diffs_object_store_proxy_download'] = false
default['gitlab']['gitlab-rails']['external_diffs_object_store_remote_directory'] = 'external-diffs'
Loading
Loading
@@ -167,7 +167,7 @@ default['gitlab']['gitlab-rails']['lfs_storage_path'] = nil
default['gitlab']['gitlab-rails']['lfs_object_store_enabled'] = false
default['gitlab']['gitlab-rails']['lfs_object_store_direct_upload'] = false
# TODO: Deprecate once direct upload is implemented
# https://gitlab.com/gitlab-org/gitlab-ce/issues/57372
# https://gitlab.com/gitlab-org/gitlab-foss/issues/57372
default['gitlab']['gitlab-rails']['lfs_object_store_background_upload'] = true
default['gitlab']['gitlab-rails']['lfs_object_store_proxy_download'] = false
default['gitlab']['gitlab-rails']['lfs_object_store_remote_directory'] = 'lfs-objects'
Loading
Loading
@@ -177,7 +177,7 @@ default['gitlab']['gitlab-rails']['uploads_base_dir'] = nil
default['gitlab']['gitlab-rails']['uploads_object_store_enabled'] = false
default['gitlab']['gitlab-rails']['uploads_object_store_direct_upload'] = false
# TODO: Deprecate once direct upload is implemented
# https://gitlab.com/gitlab-org/gitlab-ce/issues/57372
# https://gitlab.com/gitlab-org/gitlab-foss/issues/57372
default['gitlab']['gitlab-rails']['uploads_object_store_background_upload'] = true
default['gitlab']['gitlab-rails']['uploads_object_store_proxy_download'] = false
default['gitlab']['gitlab-rails']['uploads_object_store_remote_directory'] = 'uploads'
Loading
Loading
@@ -187,7 +187,7 @@ default['gitlab']['gitlab-rails']['packages_storage_path'] = nil
default['gitlab']['gitlab-rails']['packages_object_store_enabled'] = false
default['gitlab']['gitlab-rails']['packages_object_store_direct_upload'] = false
# TODO: Deprecate once direct upload is implemented
# https://gitlab.com/gitlab-org/gitlab-ce/issues/57372
# https://gitlab.com/gitlab-org/gitlab-foss/issues/57372
default['gitlab']['gitlab-rails']['packages_object_store_background_upload'] = true
default['gitlab']['gitlab-rails']['packages_object_store_proxy_download'] = false
default['gitlab']['gitlab-rails']['packages_object_store_remote_directory'] = 'packages'
Loading
Loading
@@ -197,7 +197,7 @@ default['gitlab']['gitlab-rails']['dependency_proxy_storage_path'] = nil
default['gitlab']['gitlab-rails']['dependency_proxy_object_store_enabled'] = false
default['gitlab']['gitlab-rails']['dependency_proxy_object_store_direct_upload'] = false
# TODO: Deprecate once direct upload is implemented
# https://gitlab.com/gitlab-org/gitlab-ce/issues/57372
# https://gitlab.com/gitlab-org/gitlab-foss/issues/57372
default['gitlab']['gitlab-rails']['dependency_proxy_object_store_background_upload'] = true
default['gitlab']['gitlab-rails']['dependency_proxy_object_store_proxy_download'] = false
default['gitlab']['gitlab-rails']['dependency_proxy_object_store_remote_directory'] = 'dependency_proxy'
Loading
Loading
Loading
Loading
@@ -3,7 +3,7 @@
# and run `sudo gitlab-ctl reconfigure`.
 
## GitLab
## Modified from https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/support/nginx/gitlab-ssl & https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/support/nginx/gitlab
## Modified from https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/support/nginx/gitlab-ssl & https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/support/nginx/gitlab
##
## Lines starting with two hashes (##) are comments with information.
## Lines starting with one hash (#) are configuration parameters that can be uncommented.
Loading
Loading
Loading
Loading
@@ -175,7 +175,7 @@ groups:
)
/
2 / sum(rate(grpc_server_handling_seconds_count{job="gitaly",grpc_type="unary",grpc_method!~"GarbageCollect|Fsck|RepackFull|RepackIncremental|CommitLanguages|CreateRepositoryFromURL|UserRebase|UserSquash|CreateFork|UserUpdateBranch|FindRemoteRepository|UserCherryPick|FetchRemote|UserRevert|FindRemoteRootRef"}[1m]))
# Sidekiq TODO: https://gitlab.com/gitlab-org/gitlab-ce/issues/56752
# Sidekiq TODO: https://gitlab.com/gitlab-org/gitlab-foss/issues/56752
# - record: gitlab_sli:gitlab_component_apdex:ratio
# labels:
# job: gitlab-sidekiq
Loading
Loading
@@ -234,7 +234,7 @@ groups:
sum(
rate(http_request_duration_seconds_count{job="gitlab-rails",status=~"5.."}[1m])
)
# Sidekiq TODO: https://gitlab.com/gitlab-org/gitlab-ce/issues/56752
# Sidekiq TODO: https://gitlab.com/gitlab-org/gitlab-foss/issues/56752
# - record: gitlab_sli:gitlab_component_ops:rate
# labels:
# job: gitlab-sidekiq
Loading
Loading
Loading
Loading
@@ -154,7 +154,7 @@ describe Build::Info do
 
it 'returns public mirror for GitLab CE' do
allow(Build::Info).to receive(:package).and_return("gitlab-ce")
expect(described_class.gitlab_rails_repo).to eq("https://gitlab.com/gitlab-org/gitlab-ce.git")
expect(described_class.gitlab_rails_repo).to eq("https://gitlab.com/gitlab-org/gitlab-foss.git")
end
it 'returns public mirror for GitLab EE' do
allow(Build::Info).to receive(:package).and_return("gitlab-ee")
Loading
Loading
Loading
Loading
@@ -122,8 +122,8 @@ describe 'qa', type: :rake do
allow(ENV).to receive(:[]).with('QA_TRIGGER_TOKEN').and_return("1234")
allow(ENV).to receive(:[]).with('TRIGGERED_USER').and_return("John Doe")
allow(ENV).to receive(:[]).with('CI_JOB_URL').and_return("https://gitlab.com/gitlab-org/omnibus-gitlab/-/jobs/12345")
allow(ENV).to receive(:[]).with('TOP_UPSTREAM_SOURCE_PROJECT').and_return("https://gitlab.com/gitlab-org/gitlab-ce")
allow(ENV).to receive(:[]).with('TOP_UPSTREAM_SOURCE_JOB').and_return("https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/67890")
allow(ENV).to receive(:[]).with('TOP_UPSTREAM_SOURCE_PROJECT').and_return("https://gitlab.com/gitlab-org/gitlab-foss")
allow(ENV).to receive(:[]).with('TOP_UPSTREAM_SOURCE_JOB').and_return("https://gitlab.com/gitlab-org/gitlab-foss/-/jobs/67890")
allow(ENV).to receive(:[]).with('TOP_UPSTREAM_SOURCE_SHA').and_return("abc123")
allow(DockerOperations).to receive(:build).and_return(true)
allow(Build::QA).to receive(:get_gitlab_repo).and_return("/tmp/gitlab.1234/qa")
Loading
Loading
@@ -142,8 +142,8 @@ describe 'qa', type: :rake do
"variables[RELEASE]" => "registry.gitlab.com/gitlab-ce:latest",
"variables[TRIGGERED_USER]" => "John Doe",
"variables[TRIGGER_SOURCE]" => "https://gitlab.com/gitlab-org/omnibus-gitlab/-/jobs/12345",
"variables[TOP_UPSTREAM_SOURCE_PROJECT]" => "https://gitlab.com/gitlab-org/gitlab-ce",
"variables[TOP_UPSTREAM_SOURCE_JOB]" => "https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/67890",
"variables[TOP_UPSTREAM_SOURCE_PROJECT]" => "https://gitlab.com/gitlab-org/gitlab-foss",
"variables[TOP_UPSTREAM_SOURCE_JOB]" => "https://gitlab.com/gitlab-org/gitlab-foss/-/jobs/67890",
"variables[TOP_UPSTREAM_SOURCE_SHA]" => "abc123"
}
allow_any_instance_of(Build::QATrigger).to receive(:invoke!).and_call_original
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment