Conversation
Leenday
force-pushed
the
feature/session
branch
2 times, most recently
from
94d40c0 to
055cccd
Compare
greybutton
reviewed
Nov 5, 2020
| gem 'factory_bot_rails' | ||
| gem 'rubocop' | ||
| gem 'state_machines-activerecord' | ||
| gem 'simple_form' |
There was a problem hiding this comment.
не в ту группу добавил, это гем не только в девелопе и тестах нужен, он общий
Owner
Author
There was a problem hiding this comment.
Вынес гем и отребейзил, но не совсем так, как ты говорил(или я не так понял).
Основывался на этой статье: вмёрджил предыдущие ПРы, затем перешёл на ветку девелоп локально, спулил изменения.
Вернулся на feature/session и git rebase develop. Где я ошибся и как надо было?
|
сорян, не заметил ошибки в предыдущих пулл реквестах. Поправь в них сначала, смержи и отребейзи этот пулл реквест |
Leenday
force-pushed
the
feature/controllers
branch
from
4275ab9 to
0c3d828
Compare
Leenday
force-pushed
the
feature/session
branch
from
055cccd to
0732511
Compare
greybutton
reviewed
Nov 18, 2020
greybutton
approved these changes
Nov 18, 2020
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.