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

Remove shared-web #1374

Merged
merged 26 commits into from
Oct 11, 2019
Merged

Remove shared-web #1374

merged 26 commits into from
Oct 11, 2019

Conversation

slorek
Copy link
Contributor

@slorek slorek commented Oct 7, 2019

I've completely removed shared-web:

@frankieroberto
Copy link
Contributor

Liking this a lot... 😄

Copy link
Contributor

@slawosz slawosz left a comment

Choose a reason for hiding this comment

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

Makes sense.

@slorek slorek force-pushed the remove_from_shared_web branch 2 times, most recently from fee88b6 to 824b7c0 Compare October 11, 2019 14:07
@slorek slorek changed the title WIP: Move code/dependencies from shared-web to main application where appropriate Move code/dependencies from shared-web to main application where appropriate Oct 11, 2019
@slorek slorek removed the wip label Oct 11, 2019
@slorek slorek requested a review from slawosz October 11, 2019 14:30
@slorek slorek changed the title Move code/dependencies from shared-web to main application where appropriate Remove shared-web Oct 11, 2019
Copy link
Contributor

@frankieroberto frankieroberto left a comment

Choose a reason for hiding this comment

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

Excellent work! 🎊 Have verified running it locally too.

A couple of minor comments, but nothing blocking a merge.

@slorek slorek force-pushed the remove_from_shared_web branch from fba5566 to 99ad584 Compare October 11, 2019 15:34
@slorek slorek merged commit b72e2ef into master Oct 11, 2019
@slorek slorek deleted the remove_from_shared_web branch October 11, 2019 16:12
Copy link
Contributor

@baphled baphled left a comment

Choose a reason for hiding this comment

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

👌

frankieroberto pushed a commit that referenced this pull request Oct 18, 2019
* Redirect the user to Additional Information when the user has uploaded a (#1377)

bulk files and has completed the nanomaterial section

* Remove shared-web (#1374)

* Move Coveralls rake task to main application, and delete redundant monkey patch

* Move Webpacker Rake tasks to main application

* Move application dependencies to main application

* Move initializers from shared-web to main application where dependencies are now specified

* Move shared-web models to main application. It appears the DateConcern is not used in the cosmetics-web application, so it was removed

* Remove redundant jobs folder from shared-web

* Move anti-virus analyzer classes from shared-web to main application

* Move KeycloakClient from shared-web to main application

* Remove redundant mailers from shared-web

* Move helpers from shared-web to main application

* Fix KeycloakCheck load order

* Move controllers and concerns from shared-web to main application

* Move ElasticSearch dependency to main application

* Fix session path

* Update Gemfile.lock with correct dependencies

* Correct load order of will_paginate to ensure it is loaded into Elasticsearch model

* Fix duplicate metadata methods on AntiVirusAnalyzer after merging shared-web code into main applciation

* Fix Gemfile.lock incomaptibility with bundler version

* Move assets and linting configs to main application

* Fix liniting errors

* Fix yarn install not working

* Fix static analysis task

* Remove shared-web in favour of UKGovernmentBEIS/govuk-design-system-rails gem

* Fix brakeman security warning

* Tag govuk-design-system-rails

* No need to specify linter config files

* Provide meaningful error message when domains aren't set (#1375)

* Bugfix: this contraint should match the SUBMIT_HOST (#1387)

Fixes a bug accidentally introduced by #1375.

* Run the static analysis outside of Docker. (#1390)

Docker isn’t required for the static analysis checks,
and running them directly is a lot faster.

* Make the service runnable without Docker. (#1382)

* Add `dotenv-rails` so that we can pass in environment variables to the service, without having to use Docker.

Also add `pry` for debugging

* Reorder gems

* Update sprocket to resolve CVE-2018-3760

* Update sprockets to 3.7.2 to resolve CVE-2018-3760

* Explicitly set versions for pry and dotenv-ruby

* Remove stray PSD file. (#1393)

* Remove Visual Studio IDE config (#1394)

* Review applications for easier testing

* Update pH question for components (#1388)

There are now four possible answers to the pH question, rather than a simple binary yes/no.

* Fix some legacy migrations (#1396)

For some reason, these called `safety_assured` or `create_table` outside of a `change` block, which doesn't work.

* Frame formulation ingredients (#1397)

* Redirect to the upload formulation page after declaring a component has poisonous ingredients

* Fix Rubocop complaint

* Use URL helpers to match paths in tests

* Change page title

* Allow chromedriver path to be explicitly set (#1401)
@frankieroberto frankieroberto mentioned this pull request Oct 18, 2019
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.

4 participants