Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tweak initializer file name to remove rubocop warning (#238) #245

Merged
merged 4 commits into from
Apr 25, 2021
Merged

Tweak initializer file name to remove rubocop warning (#238) #245

merged 4 commits into from
Apr 25, 2021

Conversation

DevS1993
Copy link
Contributor

  • Change name to remove rubocop warning

@coveralls
Copy link
Collaborator

coveralls commented Oct 10, 2020 •
edited
Loading

Coverage Status

Coverage increased (+0.1%) to 97.796% when pulling 31f0f1f on DevS1993:master into 2b8a568 on devise-security:master.

@dillonwelch
Copy link
Contributor

What's the rubocop warning that this was causing?

@DevS1993
Copy link
Contributor Author

DevS1993 commented Oct 11, 2020 •
edited
Loading

@oniofchaos this is the warning:

devise_security_rubocop

I made the changes as per discussions in #238 .

dillonwelch
dillonwelch reviewed Oct 13, 2020
View reviewed changes
Copy link
Contributor

@dillonwelch dillonwelch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm all for it, just two things to change.

lib/generators/devise_security/install_generator.rb Show resolved Hide resolved
README.md Show resolved Hide resolved
@olbrich olbrich added this to the 0.16.0 milestone Dec 21, 2020
@olbrich olbrich self-assigned this Dec 21, 2020
@dillonwelch
Copy link
Contributor

@DevS1993 tried fixing merge conflicts through the browser but Github didn't like what I did. Can you merge in latest master to resolve them (reverting my commits if you need to) so I can merge?

DevS1993 and others added 4 commits April 25, 2021 11:56
@DevS1993 @olbrich
Tweak initializer file name (devise-security#238)
eb061db 
 * Change name to remove rubocop warning
@salap298 @palash851
@tmr08c @olbrich
Add Hindi (hi) locale (devise-security#241)
77cd41f 
* Add Hindi (hi) locale

* Update test_install_generator.rb

* Update install_generator.rb

* Update hi.yml

* Update hi.yml

* Update install_generator.rb

* Update hi.yml

Co-authored-by: Palash Dubey <[email protected]>
Co-authored-by: Troy Rosenberg <[email protected]>
@olbrich
sort assertiions
18ed520
@olbrich
drop duplicate file references
31f0f1f
@olbrich olbrich changed the title Tweak initializer file name (#238) Tweak initializer file name to remove rubocop warning (#238) Apr 25, 2021
@olbrich olbrich enabled auto-merge (squash) April 25, 2021 16:04
@olbrich olbrich merged commit 43335ee into devise-security:master Apr 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dillonwelch dillonwelch dillonwelch left review comments

@tmr08c tmr08c tmr08c left review comments

@olbrich olbrich olbrich approved these changes

@natebird natebird natebird approved these changes

Assignees

@olbrich olbrich

Labels
hacktoberfest-accepted
Projects
None yet
Milestone
0.16.0
Development

Successfully merging this pull request may close these issues.
7 participants
@DevS1993 @coveralls @dillonwelch @natebird @olbrich @tmr08c @salap298