Commit graph

128 commits

Author SHA1 Message Date
Ari Timonen
88721b28df Fixes for development
Temporary fix for puma.rb
Rename .env.dev
Fix more merge conflicts

Dev env runs and tests run (with fails)
2020-03-14 21:43:19 +02:00
Ari Timonen
2c71b1147d Merge rails-4 to rails4 2020-03-14 21:10:24 +02:00
Ari Timonen
4e3009b5c2 Rails 4 updates 2020-03-09 00:07:12 +02:00
Ari Timonen
a511fb526e Fix merge conflicts 2020-03-08 22:58:52 +02:00
Absurdon
db9d4c1564
Added Contributor Group Treatment
* Logrotation for production
* added contributors class method to Group
* added contributor? method to User
* added contributor flag to User-API
* added Contributor-Tab to staff-page
2019-11-12 23:27:54 +01:00
Absurdon
7ec019fda6
Fixing Password Rest
* Reverting 'forgot' view back to a form
* Adding smtp configuration for production
* Adding postfix image to docker-compose
2019-10-14 22:26:43 +02:00
Ari Timonen
11fcea3259 Add docker dev version
Add env and docker files for development

Fix some random things related to rails upgrade
2019-09-24 22:55:34 +03:00
Ari Timonen
0b53968d3d Temporary commit 2019-06-01 13:56:09 +03:00
Ari Timonen
07c53b7469 Fix mysql2 schema issue 2018-11-22 19:46:46 -05:00
Ari Timonen
8ccef9e224 Update for rails 4
Add matches to routes
Update mysql2 gem

Remove caldner for moment
2018-11-22 19:46:41 -05:00
Absurdon
dec054eed8 removed shoutmsg history
removed compmod council group from staff page
fixed some errors with missing database entries
2018-09-21 17:30:43 +02:00
Ari Timonen
22fc8cb50b Update to a working version
- Use assets workaround to work around the volume issue with docker
- Add assets to gitignore
- Fix dalli hostname
- Update docker-compose to new paths for volumes
- Fix MariaDB issue with optimization opts
2018-04-25 16:41:22 +00:00
Ari Timonen
e3275b34ce Update docker version
Update fig.yml to work
Update puma to not daemonize to work
Update dockerfile too

This version should work now.
2018-04-15 11:17:59 +00:00
Ari Timonen
3984ad2442 Fix docker image
Fix bunch of things with docker and add entry.sh
2018-04-14 13:02:58 +00:00
Ari Timonen
4a8bd8ee7d Update ensl.org for docker version
Create docker version
- Remove rubyracer, use nodejs
- Add Makefile and fig.yml examples
- Update to v2 circle.yml sample
- Create Dockerfile
- Do not use nested folders in tmp for puma
2018-04-10 01:08:38 +00:00
Absurdon
826614a92c Fixed route to custom_urls#administrate 2017-11-12 18:02:53 +01:00
Absurdon
8e58a30285 Renaming because old unused stuff is getting in the way 2017-11-12 18:02:53 +01:00
Absurdon
6b334ced39 Create stubs for controller and model 2017-11-12 18:02:53 +01:00
Absurdon
62bc78274a Creating view to show confirmed matches, fixing bugs in permission logic and making proposal status updates ajax requests 2017-10-07 12:28:06 +02:00
Absurdon
fa27e9fae4 Merge branch 'master' into MatchScheduler 2017-08-30 20:14:10 +02:00
Absurdon
a43914e815 Migrated countries to use country_select gem and reworked how flags get displayed 2017-08-23 22:45:09 +02:00
Absurdon
9c9ae32a9c Merge branch 'master' into MatchScheduler 2017-07-07 16:05:02 +02:00
Absurdon
04f2fd77ff Added view for creating proposals and added some controller functionality 2017-05-11 22:26:18 +02:00
Absurdon
160fccd118 Added model and controller stub 2017-05-01 16:57:32 +02:00
Absurdon
624da53bb6 Added possibility for Admins to check on votes wo querying the database manually 2017-03-24 00:07:39 +01:00
Absurdon
50f74810ec Added possibility for Admins to check on votes wo querying the database manually 2017-03-24 00:07:39 +01:00
Ari Timonen
04b2638ebd Change capistrano version 2017-02-12 21:39:54 +01:00
Ari Timonen
e32dd60032 Change capistrano version 2017-02-12 21:39:54 +01:00
Chris Blanchard
24c825e2c9 Add teams api 2016-04-17 00:05:18 +01:00
Chris Blanchard
970f5dd9cf Add teams api 2016-04-17 00:05:18 +01:00
Prommah
c68ee2efe5 Bug fixes, improved consistency & cleanliness 2015-11-08 22:59:22 +00:00
Prommah
d64d3051dc Bug fixes, improved consistency & cleanliness 2015-11-08 22:59:22 +00:00
Prommah
099d1eb7dd Fix hound rubocop rules (hopefully) 2015-11-05 23:32:22 +00:00
Prommah
99a45666b2 Fix hound rubocop rules (hopefully) 2015-11-05 23:32:22 +00:00
Prommah
2fa7c03a51 Removed unpopular non-default style rule 2015-10-29 06:43:02 +00:00
Prommah
5e1b270787 Removed unpopular non-default style rule 2015-10-29 06:43:02 +00:00
Prommah
87701f10eb Update hound config 2015-10-28 02:51:49 +00:00
Prommah
9371d1df13 Update hound config 2015-10-28 02:51:49 +00:00
Prommah
76492ff072 Add hound & ruby style config 2015-09-24 15:04:45 +01:00
Prommah
1a582daf0c Add hound & ruby style config 2015-09-24 15:04:45 +01:00
Luke Barratt
a8cdbb932e Replace crazy NewRelic config template with a simple one 2015-08-31 16:21:16 +01:00
Luke Barratt
fbf82b6948 Replace crazy NewRelic config template with a simple one 2015-08-31 16:21:16 +01:00
Luke Barratt
eaf20e298f Removed legacy NewRelic initializer since we're no longer using Unicorn 2015-08-31 16:21:15 +01:00
Luke Barratt
b7ff6b037b Removed legacy NewRelic initializer since we're no longer using Unicorn 2015-08-31 16:21:15 +01:00
Luke Barratt
865a0cae5a Restore POST routes to /users/login and /users/logout 2015-08-23 13:24:19 +01:00
Chris Blanchard
a2ebca64f4 Share production ensl session store with subdomains 2015-08-18 11:05:52 +01:00
Chris Blanchard
007c74a6fb Share production ensl session store with subdomains 2015-08-18 11:05:52 +01:00
Luke Barratt
e6c2ebcbc3 Added .eager_load config variable to each environment respectively 2015-08-15 23:30:14 +01:00
Luke Barratt
320fc67e4c Removes outdated acts_as_versioned plugin in favour of an updated version extracted from Redmine 2015-08-15 20:28:21 +01:00
Luke Barratt
e2c8472023 Replace instances of #match with #get in application routes 2015-08-15 20:26:42 +01:00