Skip to content

Commit

Permalink
Merge pull request #780 from uktrade/develop
Browse files Browse the repository at this point in the history 
UAT Release 21-05-25
  • Loading branch information
@rafa-garcia
rafa-garcia authored May 25, 2021
2 parents 21f0182 + 71e6385 commit 8b6ade3
Show file tree
Hide file tree
Showing 97 changed files with 4,789 additions and 145 deletions.
7 changes: 3 additions & 4 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ source 'https://rubygems.org'

ruby '2.7.2'

gem 'rails', '6.0.3.5'
gem 'rails', '6.0.3.7'
gem 'bundler'
gem 'puma', '3.12.6'
gem 'puma', '4.3.8'
gem 'pg', '1.1.4'
gem 'sidekiq'
gem 'sidekiq-cron'
Expand All @@ -16,7 +16,7 @@ gem 'figaro'
gem 'friendly_id'
gem 'immutable-struct'

gem 'nokogiri', '1.11.1'
gem 'nokogiri', '1.11.4'

# Authentication & authorisation
gem 'devise', github: 'heartcombo/devise', branch: 'master'
Expand Down Expand Up @@ -45,7 +45,6 @@ gem 'neat', '1.8.0'
gem 'autoprefixer-rails'
gem 'normalize-scss'
gem 'sass-rails'
gem 'export_components', '2.2.3', git: 'https://github.com/uktrade/export_components.git'

# Javascript
gem 'jquery-rails'
Expand Down
133 changes: 62 additions & 71 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,70 +10,63 @@ GIT
responders
warden (~> 1.2.3)

GIT
remote: https://github.com/uktrade/export_components.git
revision: 379db7c53a1bb58639e678097364b4a7c4bea6f8
specs:
export_components (2.2.3)
rails (>= 5.2)

GEM
remote: https://rubygems.org/
specs:
actioncable (6.0.3.5)
actionpack (= 6.0.3.5)
actioncable (6.0.3.7)
actionpack (= 6.0.3.7)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.0.3.5)
actionpack (= 6.0.3.5)
activejob (= 6.0.3.5)
activerecord (= 6.0.3.5)
activestorage (= 6.0.3.5)
activesupport (= 6.0.3.5)
actionmailbox (6.0.3.7)
actionpack (= 6.0.3.7)
activejob (= 6.0.3.7)
activerecord (= 6.0.3.7)
activestorage (= 6.0.3.7)
activesupport (= 6.0.3.7)
mail (>= 2.7.1)
actionmailer (6.0.3.5)
actionpack (= 6.0.3.5)
actionview (= 6.0.3.5)
activejob (= 6.0.3.5)
actionmailer (6.0.3.7)
actionpack (= 6.0.3.7)
actionview (= 6.0.3.7)
activejob (= 6.0.3.7)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.0.3.5)
actionview (= 6.0.3.5)
activesupport (= 6.0.3.5)
actionpack (6.0.3.7)
actionview (= 6.0.3.7)
activesupport (= 6.0.3.7)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionpack-page_caching (1.2.2)
actionpack (>= 5.0.0)
actiontext (6.0.3.5)
actionpack (= 6.0.3.5)
activerecord (= 6.0.3.5)
activestorage (= 6.0.3.5)
activesupport (= 6.0.3.5)
actiontext (6.0.3.7)
actionpack (= 6.0.3.7)
activerecord (= 6.0.3.7)
activestorage (= 6.0.3.7)
activesupport (= 6.0.3.7)
nokogiri (>= 1.8.5)
actionview (6.0.3.5)
activesupport (= 6.0.3.5)
actionview (6.0.3.7)
activesupport (= 6.0.3.7)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
active_record_union (1.3.0)
activerecord (>= 4.0)
activejob (6.0.3.5)
activesupport (= 6.0.3.5)
activejob (6.0.3.7)
activesupport (= 6.0.3.7)
globalid (>= 0.3.6)
activemodel (6.0.3.5)
activesupport (= 6.0.3.5)
activerecord (6.0.3.5)
activemodel (= 6.0.3.5)
activesupport (= 6.0.3.5)
activestorage (6.0.3.5)
actionpack (= 6.0.3.5)
activejob (= 6.0.3.5)
activerecord (= 6.0.3.5)
marcel (~> 0.3.1)
activesupport (6.0.3.5)
activemodel (6.0.3.7)
activesupport (= 6.0.3.7)
activerecord (6.0.3.7)
activemodel (= 6.0.3.7)
activesupport (= 6.0.3.7)
activestorage (6.0.3.7)
actionpack (= 6.0.3.7)
activejob (= 6.0.3.7)
activerecord (= 6.0.3.7)
marcel (~> 1.0.0)
activesupport (6.0.3.7)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
Expand Down Expand Up @@ -1100,7 +1093,7 @@ GEM
http-accept (1.7.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
i18n (1.8.9)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
immutable-struct (2.4.1)
interception (0.5)
Expand Down Expand Up @@ -1130,20 +1123,18 @@ GEM
listen (3.2.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.9.0)
loofah (2.9.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
marcel (1.0.1)
method_source (1.0.0)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2020.0512)
mimemagic (0.3.5)
mini_mime (1.0.2)
mini_portile2 (2.5.0)
mini_mime (1.1.0)
mini_portile2 (2.5.1)
minitest (5.14.4)
mock_redis (0.23.0)
multi_json (1.15.0)
Expand All @@ -1154,7 +1145,7 @@ GEM
thor (~> 0.19)
netrc (0.11.0)
nio4r (2.5.7)
nokogiri (1.11.1)
nokogiri (1.11.4)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
normalize-scss (7.0.1)
Expand Down Expand Up @@ -1211,7 +1202,8 @@ GEM
binding_of_caller (>= 0.7)
pry (>= 0.9.11)
public_suffix (4.0.5)
puma (3.12.6)
puma (4.3.8)
nio4r (~> 2.0)
pundit (2.1.0)
activesupport (>= 3.0.0)
pundit-matchers (1.6.0)
Expand All @@ -1223,20 +1215,20 @@ GEM
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (6.0.3.5)
actioncable (= 6.0.3.5)
actionmailbox (= 6.0.3.5)
actionmailer (= 6.0.3.5)
actionpack (= 6.0.3.5)
actiontext (= 6.0.3.5)
actionview (= 6.0.3.5)
activejob (= 6.0.3.5)
activemodel (= 6.0.3.5)
activerecord (= 6.0.3.5)
activestorage (= 6.0.3.5)
activesupport (= 6.0.3.5)
rails (6.0.3.7)
actioncable (= 6.0.3.7)
actionmailbox (= 6.0.3.7)
actionmailer (= 6.0.3.7)
actionpack (= 6.0.3.7)
actiontext (= 6.0.3.7)
actionview (= 6.0.3.7)
activejob (= 6.0.3.7)
activemodel (= 6.0.3.7)
activerecord (= 6.0.3.7)
activestorage (= 6.0.3.7)
activesupport (= 6.0.3.7)
bundler (>= 1.3.0)
railties (= 6.0.3.5)
railties (= 6.0.3.7)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.4)
actionpack (>= 5.0.1.x)
Expand All @@ -1247,9 +1239,9 @@ GEM
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (6.0.3.5)
actionpack (= 6.0.3.5)
activesupport (= 6.0.3.5)
railties (6.0.3.7)
actionpack (= 6.0.3.7)
activesupport (= 6.0.3.7)
method_source
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
Expand Down Expand Up @@ -1424,7 +1416,6 @@ DEPENDENCIES
elasticsearch-extensions
elasticsearch-model (= 7.1.1)
elasticsearch-rails (= 7.1.1)
export_components (= 2.2.3)!
factory_bot_rails
faker
faraday (= 1.0.1)
Expand All @@ -1446,7 +1437,7 @@ DEPENDENCIES
listen
mock_redis
neat (= 1.8.0)
nokogiri (= 1.11.1)
nokogiri (= 1.11.4)
normalize-scss
omniauth (= 2.0.3)
omniauth-oauth2 (= 1.7.1)
Expand All @@ -1460,10 +1451,10 @@ DEPENDENCIES
pry-rails
pry-rescue
pry-stack_explorer
puma (= 3.12.6)
puma (= 4.3.8)
pundit
pundit-matchers
rails (= 6.0.3.5)
rails (= 6.0.3.7)
rails-controller-testing
redis (= 3.3.3)
redis-namespace
Expand Down
6 changes: 6 additions & 0 deletions app/assets/config/manifest.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
//= link legacy_wordpress/html5shiv
//= link legacy_wordpress/json2

//= link export-components/dit.classes.Dropdown
//= link export-components/dit.components.cookie-notice
//= link export-components/dit.components.greatDomesticHeader
//= link export-components/dit.components.magnaHeader

// Stylesheets
//= link_tree ../stylesheets/transformation
Expand Down Expand Up @@ -49,3 +53,5 @@
//= link transformation/pages/notification.css
//= link transformation/pages/opportunity.css
//= link transformation/pages/results.css
//= link export-components/main.css
//= link export-components/magna-main.css
Binary file added app/assets/images/dfit-logo-white.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/dit-logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 8b6ade3

Please sign in to comment.