diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-11-20 09:22:14 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-11-20 09:22:14 +0000 |
| commit | 4f09d099e9fa29659917f87c2dc25f2b9aa05b5e (patch) | |
| tree | a70a9b3d42c8d3762974d354b31aa611590f55b8 /app/models/repository.rb | |
| parent | 135437b70d5bf12fff17d10adeae0c459b779138 (diff) | |
| parent | 181cd299f9e06223e8338e93b1c318c671ccb1aa (diff) | |
| download | gitlab-ce-4f09d099e9fa29659917f87c2dc25f2b9aa05b5e.tar.gz | |
Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'
Adds Rubocop rule for line break after guard clause
Closes #18040
See merge request gitlab-org/gitlab-ce!15188
Diffstat (limited to 'app/models/repository.rb')
| -rw-r--r-- | app/models/repository.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 35ee12bdfa1..3655b8049d7 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -246,6 +246,7 @@ class Repository Rails.logger.error "Unable to create #{REF_KEEP_AROUND} reference for repository #{path}: #{ex}" rescue Rugged::OSError => ex raise unless ex.message =~ /Failed to create locked file/ && ex.message =~ /File exists/ + Rails.logger.error "Unable to create #{REF_KEEP_AROUND} reference for repository #{path}: #{ex}" end end @@ -666,6 +667,7 @@ class Repository def next_branch(name, opts = {}) branch_ids = self.branch_names.map do |n| next 1 if n == name + result = n.match(/\A#{name}-([0-9]+)\z/) result[1].to_i if result end.compact |