Commit Graph

1870 Commits

Author SHA1 Message Date
Jyrki 3989b71944 Merge branch 'feature/migrations' into 'master'
Append used Rails version to ActiveRecord::Migration

See merge request nilsding/retrospring!75
2020-04-19 16:13:17 +00:00
Andreas Nedbal e1f775d955 append used Rails version to ActiveRecord::Migration 2020-04-19 18:10:31 +02:00
Andreas Nedbal eee7493c91 Merge branch 'gemfile-cleanups' into 'master'
Gemfile cleanups

See merge request nilsding/retrospring!74
2020-04-19 16:06:09 +00:00
Georg Gadinger 03653fe2a5 Update paperclip 2020-04-19 17:50:14 +02:00
Georg Gadinger 76180a4498 Update spring and web-console 2020-04-19 17:41:03 +02:00
Georg Gadinger 9a2ee1a575 Use a tumblr_client version without faraday version restriction 2020-04-19 17:40:41 +02:00
Georg Gadinger 2d3e55a7c4 Replace FactoryGirl with FactoryBot 2020-04-19 17:27:42 +02:00
Georg Gadinger 3b4dc9961e Move rails-assets gems to own source block 2020-04-19 17:22:48 +02:00
Georg Gadinger 311c7ac6c0 Remove Rollbar 2020-04-19 17:20:07 +02:00
Georg Gadinger d6ca1781c0 Replace fog with fog-core and fog-local 2020-04-19 17:13:49 +02:00
Andreas Nedbal 7a0a009352 Merge branch 'remove-emoji' into 'master'
Remove twemoji

See merge request nilsding/retrospring!73
2020-04-19 15:06:00 +00:00
Georg Gadinger d680185b0b Remove twemoji 2020-04-19 17:03:53 +02:00
Georg Gadinger 5eb61eb418 Use sendmail in production 2020-04-19 15:34:45 +02:00
Jyrki 9c1dc491a4 Merge branch 'rails5' into 'update-ruby'
Rails 5.0 🎉

See merge request nilsding/retrospring!70
2020-04-19 13:09:38 +00:00
Georg Gadinger b7d1c80ff0 remove rollbar queue, use mailers queue for mail stuff 2020-04-19 15:00:50 +02:00
Georg Gadinger 958fa30f6b Use Ruby 2.7.1 2020-04-19 15:00:12 +02:00
Georg Gadinger 76f4ec35e2 get rid of "Fixnum is deprecated" warning 2020-04-19 14:39:59 +02:00
Georg Gadinger 6f6ac3cc7d Merge remote-tracking branch 'origin/master' into rails5 2020-04-19 14:32:47 +02:00
Georg Gadinger b756c35345 make capistrano work with ed25519 keys 2020-04-19 14:32:42 +02:00
Jyrki d9cff1c468 Merge branch 'update-ruby' into 'master'
Update Ruby + some gems

See merge request nilsding/retrospring!69
2020-04-19 11:57:08 +00:00
Georg Gadinger 9fa8ef1501 enable 'Discover' page for mods 2020-04-19 13:55:13 +02:00
Karina Kwiatek f287fa6092 Merge branch 'rails5.2' into 'rails5'
Upgrade to Rails 5.2

See merge request nilsding/retrospring!72
2020-04-19 00:06:36 +00:00
Karina Kwiatek a19402af41 Upgrade to Rails 5.2 2020-04-19 00:45:50 +01:00
Georg Gadinger 012d29cc20 update devise-async to 1.0 2020-04-19 01:39:36 +02:00
Georg Gadinger e3d5750c32 update devise-async to 1.0 2020-04-19 01:36:49 +02:00
Jyrki aaf682097e Merge branch 'docker' into 'rails5'
Add Docker development setup

See merge request nilsding/retrospring!71
2020-04-18 23:27:15 +00:00
Georg Gadinger 323f9d91ac Fix NoMethodError on the data page 2020-04-19 01:19:25 +02:00
Andreas Nedbal a53015f36e add Docker development setup 2020-04-19 01:17:37 +02:00
Georg Gadinger 3e7497a144 Upgrade to Rails 5 2020-04-19 00:59:22 +02:00
Georg Gadinger e52e44eff2 Gemfile: make bundle audit somewhat happy again 2020-04-18 23:53:11 +02:00
Georg Gadinger b926820d90 javascripts: "fix" (un)smile update bug 2020-04-18 23:44:59 +02:00
Georg Gadinger 3a726b83c3 Gemfile: replace thin with puma (for now only in dev) 2020-04-18 22:56:39 +02:00
Georg Gadinger 57c3e6895c use ruby 2.6.6 2020-04-18 22:22:52 +02:00
Georg Gadinger d47991f379 Fixes for devise 4.x 2019-03-29 22:37:10 +01:00
Georg Gadinger b602edafa3 Use Ruby 2.6, update a bunch of gems 2019-03-29 22:21:54 +01:00
Georg Gadinger 5a9e745bf0 update some gems to keep bundle-audit happy 2019-03-19 20:46:58 +01:00
Georg Gadinger d0c20254d2 use ruby 2.3.8 2018-12-16 19:09:55 +01:00
Georg Gadinger 309d13f497 update ruby version, change deployment target 2018-12-16 18:47:41 +01:00
Georg Gadinger fea1276bf4 add startscript for BSD 2018-12-12 21:35:45 +01:00
Georg Gadinger 07669d854f Merge branch 'filter-spam-users' into 'master'
Do not allow spam users to be created

See merge request nilsding/retrospring!68
2018-07-27 20:29:01 +02:00
Georg Gadinger a5d689e76c Do not allow spam users to be created 2018-07-27 20:27:40 +02:00
Georg Gadinger 66400c87dd Merge remote-tracking branch 'github/master' 2018-05-20 14:18:02 +02:00
Andreas N a561024b33
Merge pull request #66 from oe/patch-1
remove dead bug tracker link
2018-05-15 22:42:23 +02:00
liv c0ace7cec4
remove dead bug tracker link 2018-05-15 17:37:13 +02:00
Georg Gadinger f499d1bdd7 Merge branch 'github-master' into 'master'
Github master

See merge request nilsding/retrospring!67
2018-04-29 21:27:52 +02:00
Georg Gadinger a48214117a Merge remote-tracking branch 'github/master' into github-master 2018-04-29 21:27:11 +02:00
Tina 106b9fd71f twitter.com/retrospringnet -> retrospring 2018-04-29 21:22:16 +02:00
Tina 48215693e3 twitter.com/retro_spring -> retrospring 2018-04-29 21:22:11 +02:00
Georg Gadinger d5e49ae401
Merge pull request #65 from skielred/patch-2
twitter.com/retrospringnet -> retrospring
2018-04-29 21:20:05 +02:00
Georg Gadinger 8b7a6c2e06
Merge pull request #64 from skielred/patch-1
twitter.com/retro_spring -> retrospring
2018-04-29 21:19:54 +02:00