From 14e611a3b2009a3a7e6e5eed73abc7ec19d38daf Mon Sep 17 00:00:00 2001 From: Al Snow Date: Sat, 3 Nov 2018 09:56:45 -0400 Subject: [PATCH 01/24] Upgraded method_source gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f8785fc..b520a6d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -169,7 +169,7 @@ GEM lumberjack (1.0.13) mail (2.7.1) mini_mime (>= 0.1.1) - method_source (0.9.0) + method_source (0.9.1) mini_mime (1.0.1) mini_portile2 (2.3.0) minitest (5.11.3) From e14257c7d17245ab5aeba462036711a759d00d1c Mon Sep 17 00:00:00 2001 From: Al Snow Date: Sun, 4 Nov 2018 07:49:32 -0500 Subject: [PATCH 02/24] Upgraded capybara gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b520a6d..954d51f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -62,7 +62,7 @@ GEM bundler-audit (0.6.0) bundler (~> 1.2) thor (~> 0.18) - capybara (3.10.0) + capybara (3.10.1) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) From 25e8b8ff7c498fa9417b699a73b93eb905e9b5c3 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Mon, 5 Nov 2018 08:57:37 -0500 Subject: [PATCH 03/24] Upgraded pry gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 954d51f..3c752c7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -194,7 +194,7 @@ GEM thor (>= 0.11.5) power_assert (1.1.3) powerpack (0.1.2) - pry (0.11.3) + pry (0.12.0) coderay (~> 1.1.0) method_source (~> 0.9.0) pry-rails (0.3.6) From 1ded7b0c5f848217ccf714bf499b85856ae29003 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Mon, 5 Nov 2018 11:43:27 -0500 Subject: [PATCH 04/24] Upgraded concurrent-ruby gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3c752c7..de9e1e5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -81,7 +81,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.1) contracts (0.16.0) crass (1.0.4) cucumber (3.1.2) From 34596c09646ccb9d9ee434fde287302022699274 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Mon, 5 Nov 2018 15:47:44 -0500 Subject: [PATCH 05/24] Upgraded rack gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index de9e1e5..3cd24dc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -201,7 +201,7 @@ GEM pry (>= 0.10.4) public_suffix (3.0.3) puma (3.12.0) - rack (2.0.5) + rack (2.0.6) rack-livereload (0.3.17) rack rack-test (1.1.0) From 37fec8d387c8b0f02cbb320ab31b8cfe49c55ef2 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Tue, 6 Nov 2018 09:47:30 -0500 Subject: [PATCH 06/24] Upgraded concurrent_ruby gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3cd24dc..8007f75 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -81,7 +81,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.1) + concurrent-ruby (1.1.2) contracts (0.16.0) crass (1.0.4) cucumber (3.1.2) From 20c7286bc9db799f03570b82e56efcf6898bb459 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Tue, 6 Nov 2018 13:30:42 -0500 Subject: [PATCH 07/24] Upgraded pry-rails gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8007f75..5ec0cd4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -197,7 +197,7 @@ GEM pry (0.12.0) coderay (~> 1.1.0) method_source (~> 0.9.0) - pry-rails (0.3.6) + pry-rails (0.3.7) pry (>= 0.10.4) public_suffix (3.0.3) puma (3.12.0) From 978dbd2d783a1870a423e845c030d7a803712092 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Wed, 7 Nov 2018 08:26:15 -0500 Subject: [PATCH 08/24] Upgraded [sass, concurrent_ruby] gems --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5ec0cd4..7976bc2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -81,7 +81,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.2) + concurrent-ruby (1.1.3) contracts (0.16.0) crass (1.0.4) cucumber (3.1.2) @@ -275,7 +275,7 @@ GEM ruby-prof (0.17.0) ruby-progressbar (1.10.0) ruby_dep (1.5.0) - sass (3.6.0) + sass (3.7.0) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) From ddaa8493add25774009d78249ceba8c2fa59696a Mon Sep 17 00:00:00 2001 From: Al Snow Date: Wed, 7 Nov 2018 21:06:54 -0500 Subject: [PATCH 09/24] Upgraded sass gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7976bc2..d4e45b0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -275,7 +275,7 @@ GEM ruby-prof (0.17.0) ruby-progressbar (1.10.0) ruby_dep (1.5.0) - sass (3.7.0) + sass (3.7.1) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) From 35e9e9702c209a7dea3a0a9d96da357ad8cfe4c4 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Fri, 9 Nov 2018 08:13:01 -0500 Subject: [PATCH 10/24] Upgraded sass gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d4e45b0..c3ae525 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -275,7 +275,7 @@ GEM ruby-prof (0.17.0) ruby-progressbar (1.10.0) ruby_dep (1.5.0) - sass (3.7.1) + sass (3.7.2) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) From 75ab16f9651eec62381e9030aa847957f1e995b6 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Fri, 9 Nov 2018 10:00:23 -0500 Subject: [PATCH 11/24] Upgraded libv8 gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c3ae525..ed2c96c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -158,7 +158,7 @@ GEM kgio (2.11.2) launchy (2.4.3) addressable (~> 2.3) - libv8 (3.16.14.19) + libv8 (3.16.14.19-x86_64-darwin-16) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) From e3246c0a43fd89ebb2aeac4ce4f40e4ed8ce3533 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Mon, 12 Nov 2018 08:27:00 -0500 Subject: [PATCH 12/24] Upgraded [pry, method_source, libv8] gems --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ed2c96c..fb80fa7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -158,7 +158,7 @@ GEM kgio (2.11.2) launchy (2.4.3) addressable (~> 2.3) - libv8 (3.16.14.19-x86_64-darwin-16) + libv8 (3.16.14.19) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -169,7 +169,7 @@ GEM lumberjack (1.0.13) mail (2.7.1) mini_mime (>= 0.1.1) - method_source (0.9.1) + method_source (0.9.2) mini_mime (1.0.1) mini_portile2 (2.3.0) minitest (5.11.3) @@ -194,7 +194,7 @@ GEM thor (>= 0.11.5) power_assert (1.1.3) powerpack (0.1.2) - pry (0.12.0) + pry (0.12.1) coderay (~> 1.1.0) method_source (~> 0.9.0) pry-rails (0.3.7) From 8e54bd2d1b339cd572981db9b7841338bfffb6ae Mon Sep 17 00:00:00 2001 From: Al Snow Date: Tue, 13 Nov 2018 07:45:09 -0500 Subject: [PATCH 13/24] Upgraded pry gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index fb80fa7..b82996e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -194,7 +194,7 @@ GEM thor (>= 0.11.5) power_assert (1.1.3) powerpack (0.1.2) - pry (0.12.1) + pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) pry-rails (0.3.7) From eda9224fffd7939f24c1c8a31d82be5d76bde96d Mon Sep 17 00:00:00 2001 From: Al Snow Date: Wed, 14 Nov 2018 14:13:22 -0500 Subject: [PATCH 14/24] Upgraded regexp_parser gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b82996e..a9b3421 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -237,7 +237,7 @@ GEM rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) ref (2.0.0) - regexp_parser (1.2.0) + regexp_parser (1.3.0) responders (2.4.0) actionpack (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3) From 7af3dacd346e0d84e849c2cd37a65c00b4a69f3d Mon Sep 17 00:00:00 2001 From: Al Snow Date: Wed, 14 Nov 2018 16:32:29 -0500 Subject: [PATCH 15/24] Upgraded capybara gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index a9b3421..b05b211 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -62,7 +62,7 @@ GEM bundler-audit (0.6.0) bundler (~> 1.2) thor (~> 0.18) - capybara (3.10.1) + capybara (3.11.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) From 2450acc847479672e51ab44c854cbefa5b2f229b Mon Sep 17 00:00:00 2001 From: Al Snow Date: Thu, 15 Nov 2018 08:09:13 -0500 Subject: [PATCH 16/24] Upgraded [guard, jquery-fileupload-rails] gems --- Gemfile.lock | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b05b211..f03089c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -117,7 +117,7 @@ GEM gherkin (5.1.0) globalid (0.4.1) activesupport (>= 4.2.0) - guard (2.14.2) + guard (2.15.0) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) lumberjack (>= 1.0.12, < 2.0) @@ -146,10 +146,10 @@ GEM i18n (1.1.1) concurrent-ruby (~> 1.0) jaro_winkler (1.5.1) - jquery-fileupload-rails (0.4.7) + jquery-fileupload-rails (1.0.0) actionpack (>= 3.1) railties (>= 3.1) - sass (>= 3.2) + sassc jquery-rails (4.3.3) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) @@ -286,6 +286,9 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) + sassc (2.0.0) + ffi (~> 1.9.6) + rake shellany (0.0.1) simplecov (0.16.1) docile (~> 1.1) From a7913ce183247d7fba60a577e7effec1eb740b11 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Fri, 16 Nov 2018 18:06:02 -0500 Subject: [PATCH 17/24] Upgraded capybara gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f03089c..0900884 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -62,7 +62,7 @@ GEM bundler-audit (0.6.0) bundler (~> 1.2) thor (~> 0.18) - capybara (3.11.0) + capybara (3.11.1) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) From 2aeb4642b03903b01c27beed50c74ffe3e8dc1b6 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Sat, 17 Nov 2018 19:30:08 -0500 Subject: [PATCH 18/24] Upgraded uglifier gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0900884..a01d167 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -318,7 +318,7 @@ GEM turbolinks-source (5.2.0) tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (4.1.19) + uglifier (4.1.20) execjs (>= 0.3.0, < 3) unicode-display_width (1.4.0) unicorn (5.4.1) From e87fc38a408a4ced8887986f4ea9dc02874816f5 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Wed, 28 Nov 2018 12:10:32 -0500 Subject: [PATCH 19/24] Upgraded Rails to 5.1.6.1 + tilt gem; Downgraded bundler gem --- Gemfile | 2 +- Gemfile.lock | 70 ++++++++++++++++++++++++++-------------------------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Gemfile b/Gemfile index 023ce4e..515adef 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" #don't upgrade -gem "rails", "5.1.6" +gem "rails", "5.1.6.1" ruby "2.5.3" diff --git a/Gemfile.lock b/Gemfile.lock index a01d167..2b94690 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,39 +1,39 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.1.6) - actionpack (= 5.1.6) + actioncable (5.1.6.1) + actionpack (= 5.1.6.1) nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.1.6) - actionpack (= 5.1.6) - actionview (= 5.1.6) - activejob (= 5.1.6) + actionmailer (5.1.6.1) + actionpack (= 5.1.6.1) + actionview (= 5.1.6.1) + activejob (= 5.1.6.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.6) - actionview (= 5.1.6) - activesupport (= 5.1.6) + actionpack (5.1.6.1) + actionview (= 5.1.6.1) + activesupport (= 5.1.6.1) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.6) - activesupport (= 5.1.6) + actionview (5.1.6.1) + activesupport (= 5.1.6.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.1.6) - activesupport (= 5.1.6) + activejob (5.1.6.1) + activesupport (= 5.1.6.1) globalid (>= 0.3.6) - activemodel (5.1.6) - activesupport (= 5.1.6) - activerecord (5.1.6) - activemodel (= 5.1.6) - activesupport (= 5.1.6) + activemodel (5.1.6.1) + activesupport (= 5.1.6.1) + activerecord (5.1.6.1) + activemodel (= 5.1.6.1) + activesupport (= 5.1.6.1) arel (~> 8.0) - activesupport (5.1.6) + activesupport (5.1.6.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -206,17 +206,17 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.1.6) - actioncable (= 5.1.6) - actionmailer (= 5.1.6) - actionpack (= 5.1.6) - actionview (= 5.1.6) - activejob (= 5.1.6) - activemodel (= 5.1.6) - activerecord (= 5.1.6) - activesupport (= 5.1.6) + rails (5.1.6.1) + actioncable (= 5.1.6.1) + actionmailer (= 5.1.6.1) + actionpack (= 5.1.6.1) + actionview (= 5.1.6.1) + activejob (= 5.1.6.1) + activemodel (= 5.1.6.1) + activerecord (= 5.1.6.1) + activesupport (= 5.1.6.1) bundler (>= 1.3.0) - railties (= 5.1.6) + railties (= 5.1.6.1) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) @@ -224,9 +224,9 @@ GEM rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) rails-perftest (0.0.7) - railties (5.1.6) - actionpack (= 5.1.6) - activesupport (= 5.1.6) + railties (5.1.6.1) + actionpack (= 5.1.6.1) + activesupport (= 5.1.6.1) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -310,7 +310,7 @@ GEM ref thor (0.19.4) thread_safe (0.3.6) - tilt (2.0.8) + tilt (2.0.9) travis-lint (2.0.0) json turbolinks (5.2.0) @@ -360,7 +360,7 @@ DEPENDENCIES pry-rails puma rack-livereload - rails (= 5.1.6) + rails (= 5.1.6.1) rails-perftest rake rb-fsevent @@ -382,4 +382,4 @@ RUBY VERSION ruby 2.5.3p105 BUNDLED WITH - 1.17.1 + 1.16.6 From c9eabb3af4b1bb124abffef8a17bd3245927b2c5 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Wed, 28 Nov 2018 14:07:33 -0500 Subject: [PATCH 20/24] Upgraded bundler gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2b94690..646ea68 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -382,4 +382,4 @@ RUBY VERSION ruby 2.5.3p105 BUNDLED WITH - 1.16.6 + 1.17.1 From d3abcd4cc874e0fc310f257f5b0c3e0747bc2cd9 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Wed, 28 Nov 2018 21:28:08 -0500 Subject: [PATCH 21/24] Upgraded capybara gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 646ea68..087c069 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -62,7 +62,7 @@ GEM bundler-audit (0.6.0) bundler (~> 1.2) thor (~> 0.18) - capybara (3.11.1) + capybara (3.12.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) From 30e092cf6db522351254626cc10b8e8ce54e251c Mon Sep 17 00:00:00 2001 From: Al Snow Date: Sat, 1 Dec 2018 10:55:01 -0500 Subject: [PATCH 22/24] Upgraded test-unit gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 087c069..d6c4b5c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -303,7 +303,7 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) - test-unit (3.2.8) + test-unit (3.2.9) power_assert therubyracer (0.12.3) libv8 (~> 3.16.14.15) From 5675996af684d9450a4687cccffe2eaaf30df277 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Sun, 2 Dec 2018 09:23:27 -0500 Subject: [PATCH 23/24] Upgraded pry-rails gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d6c4b5c..839cf0c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -197,7 +197,7 @@ GEM pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) - pry-rails (0.3.7) + pry-rails (0.3.8) pry (>= 0.10.4) public_suffix (3.0.3) puma (3.12.0) From 3034fbe5785c28e59b92df9fbe6ce8b326f0f9d7 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Wed, 5 Dec 2018 08:46:28 -0500 Subject: [PATCH 24/24] Upgraded rubocop gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 839cf0c..0d6d09f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -262,7 +262,7 @@ GEM rspec-mocks (~> 3.8.0) rspec-support (~> 3.8.0) rspec-support (3.8.0) - rubocop (0.60.0) + rubocop (0.61.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.5, != 2.5.1.1)