diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /lib/atlassian | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'lib/atlassian')
-rw-r--r-- | lib/atlassian/jira_connect/client.rb | 8 | ||||
-rw-r--r-- | lib/atlassian/jira_connect/serializers/feature_flag_entity.rb | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/lib/atlassian/jira_connect/client.rb b/lib/atlassian/jira_connect/client.rb index c67fe24d456..6f87b7b7d3c 100644 --- a/lib/atlassian/jira_connect/client.rb +++ b/lib/atlassian/jira_connect/client.rb @@ -4,7 +4,7 @@ module Atlassian module JiraConnect class Client < Gitlab::HTTP def self.generate_update_sequence_id - Gitlab::Metrics::System.monotonic_time.to_i + (Time.now.utc.to_f * 1000).round end def initialize(base_uri, shared_secret) @@ -33,8 +33,6 @@ module Atlassian private def store_ff_info(project:, feature_flags:, **opts) - return unless Feature.enabled?(:jira_sync_feature_flags, project) - items = feature_flags.map { |flag| ::Atlassian::JiraConnect::Serializers::FeatureFlagEntity.represent(flag, opts) } items.reject! { |item| item.issue_keys.empty? } @@ -57,8 +55,6 @@ module Atlassian end def store_deploy_info(project:, deployments:, **opts) - return unless Feature.enabled?(:jira_sync_deployments, project) - items = deployments.map { |d| ::Atlassian::JiraConnect::Serializers::DeploymentEntity.represent(d, opts) } items.reject! { |d| d.issue_keys.empty? } @@ -69,8 +65,6 @@ module Atlassian end def store_build_info(project:, pipelines:, update_sequence_id: nil) - return unless Feature.enabled?(:jira_sync_builds, project) - builds = pipelines.map do |pipeline| build = ::Atlassian::JiraConnect::Serializers::BuildEntity.represent( pipeline, diff --git a/lib/atlassian/jira_connect/serializers/feature_flag_entity.rb b/lib/atlassian/jira_connect/serializers/feature_flag_entity.rb index e17c150aacb..3193d5bbd1e 100644 --- a/lib/atlassian/jira_connect/serializers/feature_flag_entity.rb +++ b/lib/atlassian/jira_connect/serializers/feature_flag_entity.rb @@ -50,7 +50,7 @@ module Atlassian # edit path as an interim solution. def summary(strategies = flag.strategies) { - url: project_url(flag.project) + "/-/feature_flags/#{flag.id}/edit", + url: edit_project_feature_flag_url(flag.project, flag), lastUpdated: flag.updated_at.iso8601, status: { enabled: flag.active, |