diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2018-11-01 15:20:54 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2018-11-01 15:20:54 +0000 |
commit | 3c99d8308a481b3f6edb002912ffc4d760b7fb64 (patch) | |
tree | 73555ed44c63103ae57836dd00587e45d084dff2 /app/models/commit_status.rb | |
parent | 0336dc438b6faab575df996364076b57e388cc27 (diff) | |
parent | d3a407d66fa553f3ff8afd1b9e42f01b9912e14a (diff) | |
download | gitlab-ce-gl-ui-progress-bar.tar.gz |
Merge branch 'master' into 'gl-ui-progress-bar'gl-ui-progress-bar
# Conflicts:
# app/assets/javascripts/commons/gitlab_ui.js
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 7d36f9982ab..95c88e11a6e 100644 --- a/app/models/commit_status.rb +++ b/app/models/commit_status.rb @@ -167,12 +167,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 |