Commit graph

1602 commits

Author SHA1 Message Date
Dominik M. Kwiatek
a8c335899d
Use email field for password reset (#77)
Fixes unsubmmittable password reset form
2020-04-22 19:22:16 +01:00
Georg Gadinger
0c0a5c106c
Merge pull request #73 from Retrospring/better-pagination
Use cursored pagination, remove WillPaginate
2020-04-21 20:01:07 +02:00
Georg Gadinger
101b3b68d3 Use cursored pagination, remove WillPaginate 2020-04-20 23:13:24 +02:00
Dominik M. Kwiatek
c292f51957
Set up GitHub Actions (#72)
* Add GitHub Actions config

* Add extra dependencies and use environment variable for DB config

Moved the env vars up to outside of the postgres service so this might not work

* Pass environment variables for Postgres credentials to Postgres container

* Pass service ports to application

Have a suspicion that Redis one won't work as justask.yml is probably not using ERB

* Add database.yml.postgres with port

* Cache gems; pass Redis URL as env var

* Add host to DB config

* Pass DB credentials for db:setup

* Use 127.0.0.1 instead of localhost to force TCP; Use bundler config without instead of --without

* I can't read 🗑

* 🤔

* 💻🔨 I have no idea what I'm doing…

* Testing env defined outside steps

* Move templated vars down

* Add build badge
2020-04-20 21:02:48 +01:00
Dominik M. Kwiatek
516bc48aa0
Merge pull request #70 from Retrospring/feature/announcements
Implement Announcements
2020-04-19 23:10:47 +01:00
Karina Kwiatek
6e605758a6 Minor cleanup in AnnouncementController 2020-04-19 22:59:57 +01:00
Karina Kwiatek
16ade832ca Address @nilsding's review changes 2020-04-19 22:58:47 +01:00
Georg Gadinger
3acde78388
Merge pull request #69 (nice!) from Retrospring/bugfix/empty-group-names
Do not allow creation of groups with empty names
2020-04-19 23:55:37 +02:00
Karina Kwiatek
c4164a8f34 Add AnnouncementController tests 2020-04-19 22:40:06 +01:00
Karina Kwiatek
864d5844dc Add Announcement tests 2020-04-19 22:38:01 +01:00
Georg Gadinger
477ec3e9c9 Do not allow creation of groups with empty names 2020-04-19 23:28:50 +02:00
Karina Kwiatek
4889071f95 Add JS for dismissing announcements 2020-04-19 22:27:50 +01:00
Karina Kwiatek
80c6a4272a Fix indentation in new.html.haml 2020-04-19 21:58:08 +01:00
Karina Kwiatek
e731d76d52 Update admin/announcements routes to use has_role? 2020-04-19 21:54:40 +01:00
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