diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-11-05 15:21:27 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-11-05 15:21:27 +0100 |
| commit | 36cecc8387932a5caffaf0b911df868815fb8949 (patch) | |
| tree | 58c8d7ce7e8f26913a65de0dff32899e2ab1bbc7 /app/models/commit_status.rb | |
| parent | b9419b4da8833a2360170a16f8f72ffbe1b70068 (diff) | |
| parent | c12a4a9ac7c04a215adf6062fec7bf31231c7d4a (diff) | |
| download | gitlab-ce-feature/gb/dangling-builds.tar.gz | |
Merge branch 'master' into feature/gb/dangling-buildsfeature/gb/dangling-builds
* master: (220 commits)
Conflicts:
app/models/ci/build.rb
db/schema.rb
Diffstat (limited to 'app/models/commit_status.rb')
| -rw-r--r-- | app/models/commit_status.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb index f480e72b2a8..f58474ec345 100644 --- a/app/models/commit_status.rb +++ b/app/models/commit_status.rb @@ -172,12 +172,12 @@ class CommitStatus < ActiveRecord::Base false end - # To be overriden when inherrited from + # To be overridden when inherrited from def retryable? false end - # To be overriden when inherrited from + # To be overridden when inherrited from def cancelable? false end |