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

Consul pull ⬇️ #881

Merged
merged 182 commits into from
Sep 15, 2017
Merged

Consul pull ⬇️ #881

merged 182 commits into from
Sep 15, 2017

Conversation

bertocq
Copy link

@bertocq bertocq commented Sep 8, 2017

Where

  • Related PR's:

consuldemocracy#1807
consuldemocracy#1808
consuldemocracy#1809
consuldemocracy#1810
consuldemocracy#1811
consuldemocracy#1812
consuldemocracy#1813
consuldemocracy#1814
consuldemocracy#1815
consuldemocracy#1816
consuldemocracy#1817
consuldemocracy#1818
consuldemocracy#1819
consuldemocracy#1820
consuldemocracy#1821
consuldemocracy#1832
consuldemocracy#1833
consuldemocracy#1834

What

Pull consul changes to madrid

How

  • painful merge
  • fixing stuff on yml files that should be on custom yml files (and some fixes on madrid at the same time)

Screenshots

No need

Test

No changes but we could see issues because of Gemfile changes

Deployment

First pre, then pro (again)

Warnings

Commit history is messed, can't figure out why, but someone had a branch with bad history that got us some commits from june and july... We've to enforce on consul that branches on PR's be up to date with master without issues

deppbot and others added 30 commits July 12, 2017 08:34
…eate documents controller, documents helper, routes, translations and specs
…how alert on documents tab when maximum reached. Hide upload button when maximum reached.
…th the same width. Changed position buttons in responsive. Pass scss-lint.
@bertocq bertocq merged commit 41ebad6 into master Sep 15, 2017
@bertocq bertocq deleted the consul_pull branch September 15, 2017 10:34
@bertocq bertocq changed the title Consul pull Consul pull ⬇️ Sep 22, 2017
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.

8 participants