diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-02-21 18:51:36 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-02-23 09:31:57 -0600 |
| commit | 7ea641b6d0882fc782a7eb493daf8b66d076924b (patch) | |
| tree | af94a52d4eae88b2bfd65f7c7f71a8e457defaad /lib | |
| parent | b2da4623089e4c7c53526436bd7c0a8f516910a3 (diff) | |
| download | gitlab-ce-7ea641b6d0882fc782a7eb493daf8b66d076924b.tar.gz | |
Enable Style/ColonMethodCall
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/notes.rb | 2 | ||||
| -rw-r--r-- | lib/bitbucket/representation/repo.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/gon_helper.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/shell.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/api/notes.rb b/lib/api/notes.rb index c680b77f3d9..f559a7f74a0 100644 --- a/lib/api/notes.rb +++ b/lib/api/notes.rb @@ -85,7 +85,7 @@ module API note = ::Notes::CreateService.new(user_project, current_user, opts).execute if note.valid? - present note, with: Entities::const_get(note.class.name) + present note, with: Entities.const_get(note.class.name) else not_found!("Note #{note.errors.messages}") end diff --git a/lib/bitbucket/representation/repo.rb b/lib/bitbucket/representation/repo.rb index 423eff8f2a5..59b0fda8e14 100644 --- a/lib/bitbucket/representation/repo.rb +++ b/lib/bitbucket/representation/repo.rb @@ -23,7 +23,7 @@ module Bitbucket url = raw['links']['clone'].find { |link| link['name'] == 'https' }.fetch('href') if token.present? - clone_url = URI::parse(url) + clone_url = URI.parse(url) clone_url.user = "x-token-auth:#{token}" clone_url.to_s else diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb index b8a5ac907a4..101b1b80c1e 100644 --- a/lib/gitlab/gon_helper.rb +++ b/lib/gitlab/gon_helper.rb @@ -2,7 +2,7 @@ module Gitlab module GonHelper def add_gon_variables gon.api_version = API::API.version - gon.default_avatar_url = URI::join(Gitlab.config.gitlab.url, ActionController::Base.helpers.image_path('no_avatar.png')).to_s + gon.default_avatar_url = URI.join(Gitlab.config.gitlab.url, ActionController::Base.helpers.image_path('no_avatar.png')).to_s gon.max_file_size = current_application_settings.max_attachment_size gon.relative_url_root = Gitlab.config.gitlab.relative_url_root gon.shortcuts_path = help_page_path('shortcuts') diff --git a/lib/gitlab/shell.rb b/lib/gitlab/shell.rb index 330dfd866cb..3be8d3aec9c 100644 --- a/lib/gitlab/shell.rb +++ b/lib/gitlab/shell.rb @@ -82,7 +82,7 @@ module Gitlab def import_repository(storage, name, url) # Timeout should be less than 900 ideally, to prevent the memory killer # to silently kill the process without knowing we are timing out here. - output, status = Popen::popen([gitlab_shell_projects_path, 'import-project', + output, status = Popen.popen([gitlab_shell_projects_path, 'import-project', storage, "#{name}.git", url, '800']) raise Error, output unless status.zero? true |