diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-19 15:10:17 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-19 15:10:17 +0300 |
| commit | a39371aad976d8c57224f743ef1aeb465f508695 (patch) | |
| tree | 69276be0bdcfcb06b3f8731e67eb0b452f3dc954 /lib/gitlab | |
| parent | 7866b83bf40c94e8a32d21fdea97a5e142e08f80 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/ci/features.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/database.rb | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/lib/gitlab/ci/features.rb b/lib/gitlab/ci/features.rb index 38767acf716..2f6667d3600 100644 --- a/lib/gitlab/ci/features.rb +++ b/lib/gitlab/ci/features.rb @@ -18,10 +18,6 @@ module Gitlab ::Feature.enabled?(:ci_instance_variables_ui, default_enabled: true) end - def self.composite_status?(project) - ::Feature.enabled?(:ci_composite_status, project, default_enabled: true) - end - def self.pipeline_latest? ::Feature.enabled?(:ci_pipeline_latest, default_enabled: true) end diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb index 859b53b9887..e7df9fd27f0 100644 --- a/lib/gitlab/database.rb +++ b/lib/gitlab/database.rb @@ -22,6 +22,7 @@ module Gitlab # https://www.postgresql.org/docs/9.2/static/datatype-numeric.html MAX_INT_VALUE = 2147483647 + MIN_INT_VALUE = -2147483648 # The max value between MySQL's TIMESTAMP and PostgreSQL's timestampz: # https://www.postgresql.org/docs/9.1/static/datatype-datetime.html |