From b12f6199cea8b096f029095551d57612eb3e28b0 Mon Sep 17 00:00:00 2001
From: Tobias Eidelpes <tobias@eidelpes.info>
Date: Sat, 4 Apr 2020 17:50:02 +0200
Subject: [PATCH 1/2] Change required rails version to 6.0.2.1

Signed-off-by: Tobias Eidelpes <tobias@eidelpes.info>
---
 .idea/tiss2go.iml | 26 +++++++++++++-------------
 Gemfile           |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.idea/tiss2go.iml b/.idea/tiss2go.iml
index 851566a..c8d1054 100644
--- a/.idea/tiss2go.iml
+++ b/.idea/tiss2go.iml
@@ -28,17 +28,17 @@
     </content>
     <orderEntry type="jdk" jdkName="RVM: ruby-2.7.0 [global]" jdkType="RUBY_SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="actioncable (v6.0.2.2, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="actionmailbox (v6.0.2.2, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="actionmailer (v6.0.2.2, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="actionpack (v6.0.2.2, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="actiontext (v6.0.2.2, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="actionview (v6.0.2.2, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="activejob (v6.0.2.2, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="activemodel (v6.0.2.2, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="activerecord (v6.0.2.2, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="activestorage (v6.0.2.2, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="activesupport (v6.0.2.2, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="actioncable (v6.0.2.1, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="actionmailbox (v6.0.2.1, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="actionmailer (v6.0.2.1, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="actionpack (v6.0.2.1, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="actiontext (v6.0.2.1, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="actionview (v6.0.2.1, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="activejob (v6.0.2.1, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="activemodel (v6.0.2.1, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="activerecord (v6.0.2.1, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="activestorage (v6.0.2.1, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="activesupport (v6.0.2.1, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="bootsnap (v1.4.6, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.4, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="bundler (v2.1.2, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
@@ -64,10 +64,10 @@
     <orderEntry type="library" scope="PROVIDED" name="puma (v4.3.3, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rack (v2.2.2, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rack-test (v1.1.0, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rails (v6.0.2.2, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rails (v6.0.2.1, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rails-dom-testing (v2.0.3, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rails-html-sanitizer (v1.3.0, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="railties (v6.0.2.2, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="railties (v6.0.2.1, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rake (v13.0.1, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rb-fsevent (v0.10.3, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rb-inotify (v0.10.1, RVM: ruby-2.7.0 [global]) [gem]" level="application" />
diff --git a/Gemfile b/Gemfile
index 94aa4f1..3e8b09b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby '2.7.0'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 6.0.2', '>= 6.0.2.1'
+gem 'rails', '= 6.0.2.1'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3', '~> 1.4'
 # Use Puma as the app server

From bec03e432f8c51b5fb7bf0ee754befb54ae8e6ff Mon Sep 17 00:00:00 2001
From: Tobias Eidelpes <tobias@eidelpes.info>
Date: Sat, 4 Apr 2020 17:52:07 +0200
Subject: [PATCH 2/2] Add .idea to .gitignore

Signed-off-by: Tobias Eidelpes <tobias@eidelpes.info>
---
 .gitignore | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 559d5b6..d095376 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,25 +80,6 @@ pickle-email-*.html
 # tilde files are usually backup files from a text editor
 *~
 
-# User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
-
-# Generated files
-.idea/**/contentModel.xml
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-
 *.bak
 *.rbc
 .#*
@@ -108,4 +89,5 @@ pickle-email-*.html
 /coverage
 /html
 /pkg
-Gemfile.lock
\ No newline at end of file
+Gemfile.lock
+.idea
\ No newline at end of file