diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 09:08:28 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 09:08:28 +0000 |
| commit | 6ac4a6713ed3196af899011f7e18658e16ebaac0 (patch) | |
| tree | c60237cb5203d171481b765d31bfead080d063cf /lib | |
| parent | d2b64c37bdef067656fdc8deb4728a2fbc6c2729 (diff) | |
| download | gitlab-ce-6ac4a6713ed3196af899011f7e18658e16ebaac0.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces.rb b/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces.rb index cea25967801..6b9af51a6ab 100644 --- a/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces.rb +++ b/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces.rb @@ -45,7 +45,7 @@ module Gitlab reverts_for_type('namespace') do |path_before_rename, current_path| matches_path = MigrationClasses::Route.arel_table[:path].matches(current_path) namespace = MigrationClasses::Namespace.joins(:route) - .where(matches_path).first&.becomes(MigrationClasses::Namespace) + .find_by(matches_path)&.becomes(MigrationClasses::Namespace) if namespace perform_rename(namespace, current_path, path_before_rename) diff --git a/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects.rb b/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects.rb index 4dc7a62797a..8b92b296408 100644 --- a/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects.rb +++ b/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects.rb @@ -37,7 +37,7 @@ module Gitlab reverts_for_type('project') do |path_before_rename, current_path| matches_path = MigrationClasses::Route.arel_table[:path].matches(current_path) project = MigrationClasses::Project.joins(:route) - .where(matches_path).first + .find_by(matches_path) if project perform_rename(project, current_path, path_before_rename) diff --git a/lib/gitlab/import_export/base/object_builder.rb b/lib/gitlab/import_export/base/object_builder.rb index 109d2e233a5..48836729ff6 100644 --- a/lib/gitlab/import_export/base/object_builder.rb +++ b/lib/gitlab/import_export/base/object_builder.rb @@ -62,7 +62,7 @@ module Gitlab end def find_object - klass.where(where_clause).first + klass.find_by(where_clause) end def where_clause diff --git a/lib/gitlab/import_export/members_mapper.rb b/lib/gitlab/import_export/members_mapper.rb index 5832b72ab46..263c49c509f 100644 --- a/lib/gitlab/import_export/members_mapper.rb +++ b/lib/gitlab/import_export/members_mapper.rb @@ -19,7 +19,7 @@ module Gitlab @exported_members.inject(missing_keys_tracking_hash) do |hash, member| if member['user'] old_user_id = member['user']['id'] - existing_user = User.where(find_user_query(member)).first + existing_user = User.find_by(find_user_query(member)) hash[old_user_id] = existing_user.id if existing_user && add_team_member(member, existing_user) else add_team_member(member) |