Karina Kwiatek
|
391f4a28ed
|
Merge branch 'master' into feature/announcements
# Conflicts:
# db/schema.rb
|
2020-04-19 21:52:58 +01:00 |
|
Georg Gadinger
|
da25be15b1
|
Merge pull request #67 from Retrospring/use-real-roles
Use Rolify for admin and moderator roles
|
2020-04-19 22:50:44 +02:00 |
|
Karina Kwiatek
|
a505e7ee71
|
Ensure we're logged in as an admin when using the AnnouncementController
|
2020-04-19 21:45:07 +01:00 |
|
Karina Kwiatek
|
b6d6c1fded
|
Add announcements to the top of the application template
|
2020-04-19 21:38:21 +01:00 |
|
Georg Gadinger
|
946bb3ae9d
|
Use Rolify for admin and moderator roles
|
2020-04-19 22:35:58 +02:00 |
|
Georg Gadinger
|
a0c9641994
|
Remove useless specs
|
2020-04-19 22:31:43 +02:00 |
|
Karina Kwiatek
|
473f2cdcc5
|
Show announcement validation errors on the frontend
|
2020-04-19 21:26:55 +01:00 |
|
Karina Kwiatek
|
2ecc746e23
|
Implement validation for announcements
|
2020-04-19 21:11:22 +01:00 |
|
Karina Kwiatek
|
6187cb0b6c
|
Add the ability to edit announcements
|
2020-04-19 20:58:57 +01:00 |
|
Karina Kwiatek
|
f14a168bce
|
Implement deletion of announcements
|
2020-04-19 20:50:33 +01:00 |
|
Karina Kwiatek
|
e3b89f7346
|
Implement creation of announcements
|
2020-04-19 20:34:48 +01:00 |
|
Karina Kwiatek
|
8a632a09cd
|
Create Announcement model & controller
|
2020-04-19 20:12:22 +01:00 |
|
Georg Gadinger
|
34604ae06f
|
Remove Travis config
|
2020-04-19 19:56:01 +02:00 |
|
Andreas Nedbal
|
0a32216128
|
Merge branch 'prepare-for-gh' into 'master'
Prepare for GitHub
See merge request nilsding/retrospring!76
|
2020-04-19 17:53:05 +00:00 |
|
Georg Gadinger
|
79f45ee20e
|
Surprise!
|
2020-04-19 19:49:53 +02:00 |
|
Georg Gadinger
|
6999695ff8
|
Cleanup
|
2020-04-19 19:49:47 +02:00 |
|
Georg Gadinger
|
2237287472
|
Remove Capistrano
|
2020-04-19 19:43:55 +02:00 |
|
Georg Gadinger
|
8b129bbbf4
|
Fix moderation panel.
|
2020-04-19 18:33:20 +02:00 |
|
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 |