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

Add EditorConfig file #1148

Merged
merged 2 commits into from
Apr 19, 2020
Merged

Add EditorConfig file #1148

merged 2 commits into from
Apr 19, 2020

Conversation

AlexWayfer
Copy link
Contributor

Resolve issues.

More info here: https://editorconfig.org/

@AlexWayfer
Add EditorConfig file
e30e020 
Resolve issues.

More info here: https://editorconfig.org/
@AlexWayfer AlexWayfer force-pushed the add_editor_config_file branch from 0427312 to e30e020 Compare April 17, 2020 22:26
@AlexWayfer AlexWayfer changed the title Add EditoConfig file Add EditorConfig file Apr 17, 2020
olleolleolle
olleolleolle approved these changes Apr 17, 2020
View reviewed changes
Copy link
Member

@olleolleolle olleolleolle left a comment

Choose a reason for hiding this comment

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

Looks good to me, we can merge this after RuboCop updates have made the Linting step pass.
Thanks for making it!

@AlexWayfer
Copy link
Contributor Author

we can merge this after RuboCop updates have made the Linting step pass.

Can I track it somewhere or help with it? I see it fails in two different PRs and there is success in master.

@AlexWayfer
Copy link
Contributor Author

I'm trying to resolve these issues separately.

@AlexWayfer
Copy link
Contributor Author

Done in #1149.

@olleolleolle
Copy link
Member

@AlexWayfer I'm going to "Update branch" using this big button and then rebase merge this onto master. Thanks!

@olleolleolle olleolleolle merged commit 680b9f8 into lostisland:master Apr 19, 2020
@AlexWayfer AlexWayfer deleted the add_editor_config_file branch April 19, 2020 22:09
@AlexWayfer
Copy link
Contributor Author

@AlexWayfer I'm going to "Update branch" using this big button and then rebase merge this onto master. Thanks!

I didn't rebase it in time! OK, thank you.

@olleolleolle
Copy link
Member

@AlexWayfer https://github.com/lostisland/faraday/commits/master the commit turned out fine. ✨

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@olleolleolle olleolleolle olleolleolle approved these changes

@iMacTia iMacTia iMacTia approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@AlexWayfer @olleolleolle @iMacTia