diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-02-21 16:31:14 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-02-21 16:31:14 -0600 |
| commit | f40716f48a25809d197ba2abf32ce150b7b73efa (patch) | |
| tree | 3356ea055ddee37517467c1f0ed4f4b98f655e6f /app/models | |
| parent | deb62183edbd9111691f62a4f6a9febb1fcd79f7 (diff) | |
| download | gitlab-ce-f40716f48a25809d197ba2abf32ce150b7b73efa.tar.gz | |
No more and/or
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project.rb | 2 | ||||
| -rw-r--r-- | app/models/project_services/drone_ci_service.rb | 2 | ||||
| -rw-r--r-- | app/models/project_services/irker_service.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index fc5b1a66910..411299eef63 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -552,7 +552,7 @@ class Project < ActiveRecord::Base end def check_limit - unless creator.can_create_project? or namespace.kind == 'group' + unless creator.can_create_project? || namespace.kind == 'group' projects_limit = creator.projects_limit if projects_limit == 0 diff --git a/app/models/project_services/drone_ci_service.rb b/app/models/project_services/drone_ci_service.rb index 942ec9371e5..1ad9efac196 100644 --- a/app/models/project_services/drone_ci_service.rb +++ b/app/models/project_services/drone_ci_service.rb @@ -52,7 +52,7 @@ class DroneCiService < CiService response = HTTParty.get(commit_status_path(sha, ref), verify: enable_ssl_verification) status = - if response.code == 200 and response['status'] + if response.code == 200 && response['status'] case response['status'] when 'killed' :canceled diff --git a/app/models/project_services/irker_service.rb b/app/models/project_services/irker_service.rb index 5d93064f9b3..5d6862d9faa 100644 --- a/app/models/project_services/irker_service.rb +++ b/app/models/project_services/irker_service.rb @@ -96,7 +96,7 @@ class IrkerService < Service rescue URI::InvalidURIError end - unless uri.present? and default_irc_uri.nil? + unless uri.present? && default_irc_uri.nil? begin new_recipient = URI.join(default_irc_uri, '/', recipient).to_s uri = consider_uri(URI.parse(new_recipient)) |