diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-18 18:10:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-18 18:10:33 +0300 |
| commit | d9e07a155e65cd4a7d2a1e0f10cd200a6b57371e (patch) | |
| tree | 74c8de74729a462db976287c0b709c754dce5b6f /config | |
| parent | f10eb9ebaefb0d6ff4ee7552dbf127dc70aaf27d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
4 files changed, 16 insertions, 2 deletions
diff --git a/config/feature_flags/development/ci_if_parenthesis_enabled.yml b/config/feature_flags/development/ci_if_parenthesis_enabled.yml new file mode 100644 index 00000000000..5de7f9cf09a --- /dev/null +++ b/config/feature_flags/development/ci_if_parenthesis_enabled.yml @@ -0,0 +1,7 @@ +--- +name: ci_if_parenthesis_enabled +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37574 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/238174 +group: group::ci +type: development +default_enabled: true
\ No newline at end of file diff --git a/config/feature_flags/development/ci_plan_needs_size_limit.yml b/config/feature_flags/development/ci_plan_needs_size_limit.yml new file mode 100644 index 00000000000..826aeb8f030 --- /dev/null +++ b/config/feature_flags/development/ci_plan_needs_size_limit.yml @@ -0,0 +1,7 @@ +--- +name: ci_plan_needs_size_limit +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37568 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/238173 +group: group::ci +type: development +default_enabled: true
\ No newline at end of file diff --git a/config/feature_flags/development/reorder_designs.yml b/config/feature_flags/development/reorder_designs.yml index 3bb05ff743f..89c6bec7351 100644 --- a/config/feature_flags/development/reorder_designs.yml +++ b/config/feature_flags/development/reorder_designs.yml @@ -4,4 +4,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37835 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/232992 group: group::knowledge type: development -default_enabled: false +default_enabled: true diff --git a/config/initializers/rails_host_authorization.rb b/config/initializers/rails_host_authorization.rb index 6cca39ea95b..7d719dd519f 100644 --- a/config/initializers/rails_host_authorization.rb +++ b/config/initializers/rails_host_authorization.rb @@ -3,7 +3,7 @@ # This file requires config/initializers/1_settings.rb if Rails.env.development? - Rails.application.config.hosts += [Gitlab.config.gitlab.host, 'unix'] + Rails.application.config.hosts += [Gitlab.config.gitlab.host, 'unix', 'host.docker.internal'] if ENV['RAILS_HOSTS'] additional_hosts = ENV['RAILS_HOSTS'].split(',').select(&:presence) |