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.

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

Added field of domain company #140

Merged
merged 2 commits into from
Oct 29, 2018
Merged

Added field of domain company #140

merged 2 commits into from
Oct 29, 2018

Conversation

rafaelsevla
Copy link
Contributor

dominio da empresa nos campos de criação

@sourcelevel-bot
Copy link

Hello, @rafaelsevla! This is your first Pull Request that will be reviewed by Ebert, an automatic Code Review service. It will leave comments on this diff with potential issues and style violations found in the code as you push new commits. You can also see all the issues found on this Pull Request on its review page. Please check our documentation for more information.

db/schema.rb Outdated
@@ -0,0 +1,58 @@
# This file is auto-generated from the current state of the database. Instead
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not sure if this file should be in the repository, could you please confirm @duduribeiro? I think this is a reminiscent of the workaround to run using Docker.

Copy link
Member

Choose a reason for hiding this comment

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

you are right, this should be removed. @rafaelsevla can you remove this file and recommit again?

Copy link
Member

@duduribeiro duduribeiro left a comment

Choose a reason for hiding this comment

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

@rafaelsevla also, can you change the commit message?

Please use imperative titles. (look this: https://chris.beams.io/posts/git-commit/#imperative)

In this case, you should use:

Add domain field for Company

delete schemas because this file should not be in the repository
@samuelgrigolato
Copy link
Contributor

@rafaelsevla I'd rather prefer a rebase instead of creating a new commit removing the schema.rb file, but I'm approving the changes anyway, if @duduribeiro approves the PR then for me it is good to merge. Thanks very much!

@duduribeiro
Copy link
Member

@samuelgrigolato I can approve and squash both commits via Github (and also change the commit message). WDYT?

@samuelgrigolato
Copy link
Contributor

Indeed, squashing the commits should be enough for keeping the history in a clean state. Works for me!

@duduribeiro duduribeiro merged commit 2a83e38 into opensanca:master Oct 29, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants