forked from consuldemocracy/consuldemocracy
-
Notifications
You must be signed in to change notification settings - Fork 16
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
Budgets information phase #1151
Merged
Merged
Conversation
This file contains 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
MariaCheca
force-pushed
the
2349-budgets_info_phase
branch
from
January 25, 2018 15:03
d301565
to
5a29946
Compare
Specs to test the functionality added.
voodoorai2000
force-pushed
the
2349-budgets_info_phase
branch
from
January 29, 2018 14:35
5a29946
to
7d9a41b
Compare
bertocq
reviewed
Feb 2, 2018
expect(page).not_to have_link "#{heading.name} €1,000,000" | ||
expect(page).to have_content "#{heading.name} €1,000,000" | ||
|
||
<<<<<<< HEAD |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Mergers are hard, but please do them with calm 🙏
Okey only flakies! Deploying to PRE! |
This breaks hidden links but will fix with consuldemocracy#2386 i n master directly, Unexistent information phase on ddbb has to be fixed manually through pre/pro console :/ |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Consul PR: consuldemocracy#2349