Robert Speicher 989a9607e6 Merge branch 'rubocop/enable-identical-conditional-branches-cop' into 'master' ...

Enable Style/IdenticalConditionalBranches Rubocop cop

## What does this MR do?

This MR enables Rubocop cop that checks for identical lines at the end of each branch of a conditional statement.

Examples:

```ruby
@bad
if condition
  do_x
  do_z
else
  do_y
  do_z
end

@good
if condition
  do_x
else
  do_y
end
do_z
```

## What are the relevant issue numbers?

#17478

See merge request !5011

2016-07-08 16:34:53 +00:00

..

ci

Use scope rather than class method

2016-07-07 18:56:02 +08:00

concerns

Remove duplication, unused methods, and some other style things

2016-07-06 19:29:41 -04:00

hooks

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

members

Enable Style/EmptyLines cop, remove redundant ones

2016-07-01 21:56:17 +02:00

network

Enable Style/SpaceAfterComma Rubocop cop

2016-06-29 15:23:44 +02:00

project_services

Remove legacy conditional from irker service code

2016-07-08 11:06:54 +02:00

.gitkeep

init commit

2011-10-09 00:36:38 +03:00

ability.rb

Add a migration to remove requesters that are owners of their project

2016-07-05 18:55:35 +02:00

abuse_report.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

appearance.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

application_setting.rb

Added setting to set new users by default as external

2016-07-07 19:21:18 +02:00

audit_event.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

award_emoji.rb

Add emoji.rb in lib/gitlab instead of using the gitlab_emoji gem.

2016-06-29 14:53:09 -06:00

blob.rb

Revert "squashed merge and fixed conflicts"

2016-06-16 12:59:07 +02:00

broadcast_message.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

commit_range.rb

Fix comment for project argument in commit_range.rb

2016-06-20 11:12:04 -07:00

commit_status.rb

Rename commit_data in Pipeline to commit

2016-06-21 14:43:37 +02:00

commit.rb

Represent DiffRefs as proper class instead of tuple array

2016-07-06 18:50:58 -04:00

deploy_key.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

deploy_keys_project.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

deployment.rb

Support new diff notes on MRs with diff_refs

2016-07-06 18:51:00 -04:00

diff_note.rb

Make DiffNote#update_position private

2016-07-07 16:13:55 -04:00

email.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

environment.rb

Revert "squashed merge and fixed conflicts"

2016-06-16 12:59:07 +02:00

event.rb

Use a more future-proof check for Note/LegacyDiffNote

2016-07-06 10:08:42 +02:00

external_issue.rb

Merge branch 'master' into number_sign_for_external_issue_ref

2016-04-17 18:17:27 +02:00

forked_project_link.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

generic_commit_status.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

global_label.rb

Updates from last code review.

2016-03-06 23:07:19 -05:00

global_milestone.rb

Ruby fixes

2016-03-29 12:19:09 +01:00

group.rb

Dumb-down avatar presence check in avatar_url methods

2016-07-05 10:51:11 -04:00

identity.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

issue.rb

use has_many relationship with events

2016-07-01 15:34:10 +02:00

key.rb

Remove Duplicated keys add UNIQUE index to fingerprint

2016-06-20 13:29:04 +02:00

label_link.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

label.rb

Use CGI.unescapeHTML rather than doing the gsub with a map

2016-07-05 20:57:09 -03:00

legacy_diff_note.rb

Extract parts of LegacyDiffNote into DiffOnNote concern and move part of responsibility to other classes

2016-07-06 18:50:59 -04:00

lfs_object.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

lfs_objects_project.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

member.rb

Exclude requesters from Project#members, Group#members and User#members

2016-07-01 17:44:46 +02:00

merge_request_diff.rb

We can't call private methods with self.

2016-07-07 14:14:13 -04:00

merge_request.rb

Memoize MR merged/closed events retrieval

2016-07-08 12:35:42 +02:00

milestone.rb

use has_many relationship with events

2016-07-01 15:34:10 +02:00

namespace.rb

Refactor repository paths handling to allow multiple git mount points

2016-06-29 22:30:31 -04:00

note.rb

Add DiffNote model

2016-07-06 18:50:59 -04:00

notification_setting.rb

Exclude projects pending delete from notifications

2016-07-07 20:49:17 +01:00

oauth_access_token.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

personal_access_token.rb

Address @DouweM's feedback on !3749.

2016-04-28 22:28:36 +05:30

personal_snippet.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

project_group_link.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

project_import_data.rb

add missing attribute to attr_encrypted so it is fully backwards-compatible

2016-06-28 09:55:19 +02:00

project_snippet.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

project_team.rb

Exclude requesters from Project#members, Group#members and User#members

2016-07-01 17:44:46 +02:00

project_wiki.rb

Refactor repository paths handling to allow multiple git mount points

2016-06-29 22:30:31 -04:00

project.rb

Merge branch 'prefer-ref' into 'master'

2016-07-07 22:47:38 +00:00

protected_branch.rb

Have Project#open_branches return branches that are matched by a wildcard protected branch.

2016-07-07 10:07:31 +05:30

release.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

repository.rb

Merge branch 'prefer-ref' into 'master'

2016-07-07 22:47:38 +00:00

security_event.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

sent_notification.rb

Allow reply-by-email with diff notes

2016-07-06 18:51:00 -04:00

service.rb

Added Bugzilla as external issue tracker option

2016-06-29 06:01:54 -04:00

snippet.rb

Merge branch 'feature/custom-highlighting' into 'master'

2016-06-28 08:42:42 +00:00

spam_log.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

spam_report.rb

Support Akismet spam checking for creation of issues via API

2016-02-02 11:25:44 -02:00

subscription.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

todo.rb

Don't garbage collect commits that have related DB records like comments

2016-07-04 00:11:33 -04:00

tree.rb

Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobs

2016-02-01 13:51:05 +01:00

u2f_registration.rb

Add a U2fRegistrations table/model.

2016-06-06 12:50:31 +05:30

user.rb

Added setting to set new users by default as external

2016-07-07 19:21:18 +02:00

users_star_project.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

wiki_page.rb

add slack notifications for wiki pages

2016-04-20 08:25:40 +08:00