Karina Kwiatek 391f4a28ed Merge branch 'master' into feature/announcements ... # Conflicts: # db/schema.rb		2020-04-19 21:52:58 +01:00
..
ajax	Use Rolify for admin and moderator roles	2020-04-19 22:35:58 +02:00
concerns	first commit	2014-08-01 11:23:47 +02:00
user	Move account deletion to Sidekiq worker, fixes #11	2015-07-15 01:44:35 +02:00
announcement_controller.rb	Ensure we're logged in as an admin when using the AnnouncementController	2020-04-19 21:45:07 +01:00
answer_controller.rb	Fix retrospring/bugs#43	2015-05-05 02:36:57 +05:30
application_controller.rb	Add announcements to the top of the application template	2020-04-19 21:38:21 +01:00
discover_controller.rb	Merge remote-tracking branch 'origin/master' into rails5	2020-04-19 14:32:47 +02:00
group_controller.rb	Upgrade to Rails 5.2	2020-04-19 00:45:50 +01:00
inbox_controller.rb	Upgrade to Rails 5.2	2020-04-19 00:45:50 +01:00
moderation_controller.rb	Fix moderation panel.	2020-04-19 18:33:20 +02:00
notifications_controller.rb	Upgrade to Rails 5.2	2020-04-19 00:45:50 +01:00
public_controller.rb	Upgrade to Rails 5.2	2020-04-19 00:45:50 +01:00
question_controller.rb	added pagination to answers	2015-01-03 19:24:51 +01:00
services_controller.rb	git localize flashes	2015-06-07 19:03:57 +02:00
static_controller.rb	move check if user is logged in out of template	2015-08-28 16:36:49 +02:00
user_controller.rb	Upgrade to Rails 5.2	2020-04-19 00:45:50 +01:00