zenon/tiss2go
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.com/kranklyboy/tiss2go

Browse Source 
 Conflicts:
	.gitignore
This commit is contained in:
Marco Zeisler 2020-04-04 17:53:33 +02:00
commit 21e2b19b5f
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -109,4 +109,4 @@ pickle-email-*.html
/html /html
/pkg /pkg
Gemfile.lock Gemfile.lock
/.idea/tiss2go.iml .idea

26
.idea/tiss2go.iml generated
View File

@ -28,17 +28,17 @@
</content> </content>
<orderEntry type="jdk" jdkName="RVM: ruby-2.7.0 [global]" jdkType="RUBY_SDK" /> <orderEntry type="jdk" jdkName="RVM: ruby-2.7.0 [global]" jdkType="RUBY_SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <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="actioncable (v6.0.2.1, 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="actionmailbox (v6.0.2.1, 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="actionmailer (v6.0.2.1, 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="actionpack (v6.0.2.1, 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="actiontext (v6.0.2.1, 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="actionview (v6.0.2.1, 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="activejob (v6.0.2.1, 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="activemodel (v6.0.2.1, 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="activerecord (v6.0.2.1, 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="activestorage (v6.0.2.1, 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="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="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="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" /> <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="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 (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="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-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="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="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-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" /> <orderEntry type="library" scope="PROVIDED" name="rb-inotify (v0.10.1, RVM: ruby-2.7.0 [global]) [gem]" level="application" />

2
Gemfile
View File

@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby '2.7.0' ruby '2.7.0'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' # 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 # Use sqlite3 as the database for Active Record
gem 'sqlite3', '~> 1.4' gem 'sqlite3', '~> 1.4'
# Use Puma as the app server # Use Puma as the app server