Wrap against 80 chars and rename failed_or_canceledfix-cancelling-pipelines

to better reflect the status. Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7508#note_18858398

1 files changed, 9 insertions, 7 deletions

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index c0f2c8ba787..4294a10e9e3 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -169,17 +169,19 @@ module Ci
     end
 
     def cancel_running
-      Gitlab::OptimisticLocking.retry_lock(statuses.cancelable) do |cancelable|
-        cancelable.each(&:cancel)
-      end
+      Gitlab::OptimisticLocking.retry_lock(
+        statuses.cancelable) do |cancelable|
+          cancelable.each(&:cancel)
+        end
     end
 
     def retry_failed(user)
-      Gitlab::OptimisticLocking.retry_lock(builds.latest.failed_or_canceled) do |failed|
-        failed.select(&:retryable?).each do |build|
-          Ci::Build.retry(build, user)
+      Gitlab::OptimisticLocking.retry_lock(
+        builds.latest.failed_or_canceled) do |failed_or_canceled|
+          failed_or_canceled.select(&:retryable?).each do |build|
+            Ci::Build.retry(build, user)
+          end
         end
-      end
     end
 
     def mark_as_processable_after_stage(stage_idx)