diff --git a/app/assets/stylesheets/pages/cycle_analytics.scss b/app/assets/stylesheets/pages/cycle_analytics.scss index d62b9b917ee..bf76044fa53 100644 --- a/app/assets/stylesheets/pages/cycle_analytics.scss +++ b/app/assets/stylesheets/pages/cycle_analytics.scss @@ -62,7 +62,7 @@ font-weight: 600; } &:text { - color: #8C8C8C; + color: #8c8c8c; } } } @@ -103,7 +103,7 @@ } p { - color: #8C8C8C; + color: #8c8c8c; margin-bottom: $gl-padding; } } diff --git a/app/models/deployment.rb b/app/models/deployment.rb index 31a5bb1f962..15f349c89bb 100644 --- a/app/models/deployment.rb +++ b/app/models/deployment.rb @@ -43,7 +43,6 @@ class Deployment < ActiveRecord::Base project.repository.is_ancestor?(commit.id, sha) end - def update_merge_request_metrics if environment.update_merge_request_metrics? merge_requests = project.merge_requests. diff --git a/lib/gitlab/database/median.rb b/lib/gitlab/database/median.rb index 21b4c043655..94f060bd2c7 100644 --- a/lib/gitlab/database/median.rb +++ b/lib/gitlab/database/median.rb @@ -27,12 +27,11 @@ module Gitlab from(arel_table.project(Arel.sql('*')).order(arel_table[column_sym]).as(arel_table.table_name)). project(average([arel_table[column_sym]], 'median')). where(Arel::Nodes::Between.new( - Arel.sql("(select @row_id := @row_id + 1)"), - Arel::Nodes::And.new( - [Arel.sql('@ct/2.0'), - Arel.sql('@ct/2.0 + 1')] - ) - )). + Arel.sql("(select @row_id := @row_id + 1)"), + Arel::Nodes::And.new( + [Arel.sql('@ct/2.0'), + Arel.sql('@ct/2.0 + 1')] + ))). # Disallow negative values where(arel_table[column_sym].gteq(0)) diff --git a/spec/models/cycle_analytics/plan_spec.rb b/spec/models/cycle_analytics/plan_spec.rb index aa779e5050f..4a66615e53b 100644 --- a/spec/models/cycle_analytics/plan_spec.rb +++ b/spec/models/cycle_analytics/plan_spec.rb @@ -7,8 +7,12 @@ describe 'CycleAnalytics#plan', feature: true do subject { CycleAnalytics.new(project, from: from_date) } generate_cycle_analytics_spec(phase: :plan, - data_fn: -> (context) { { issue: context.create(:issue, project: context.project), - branch_name: context.random_git_name } }, + data_fn: -> (context) do + { + issue: context.create(:issue, project: context.project), + branch_name: context.random_git_name + } + end, start_time_conditions: [["issue associated with a milestone", -> (context, data) { data[:issue].update(milestone: context.create(:milestone, project: context.project)) }], ["list label added to issue", -> (context, data) { data[:issue].update(label_ids: [context.create(:label, lists: [context.create(:list)]).id]) }]], end_time_conditions: [["issue mentioned in a commit", -> (context, data) { context.create_commit_referencing_issue(data[:issue], branch_name: data[:branch_name]) }]], diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb index cfd506707de..84b0acffaac 100644 --- a/spec/services/merge_requests/update_service_spec.rb +++ b/spec/services/merge_requests/update_service_spec.rb @@ -276,7 +276,6 @@ describe MergeRequests::UpdateService, services: true do expect(merge_request.reload.issues_closed).to match_array([first_issue, second_issue]) end - end it 'removes `MergeRequestsClosingIssues` records when issues are not closed anymore' do opts = { @@ -297,5 +296,6 @@ describe MergeRequests::UpdateService, services: true do expect(merge_request.reload.issues_closed).to be_empty end + end end end