Commit Graph

4221 Commits

Author SHA1 Message Date
Andrew Brown
13f23cbd52 Merge branch 'marketing-changes' 2019-09-11 18:51:59 -05:00
AmyMartika
7508ecdb0b Merge branch 'marketing-changes' of https://github.com/indentlabs/notebook into marketing-changes 2019-09-11 18:50:35 -05:00
AmyMartika
66f20596e6 Fixing a heading tag that was changed on accident 2019-09-11 18:49:46 -05:00
Andrew Brown
4920ea43f9 Revert "Revert "revert this later""
This reverts commit 52f2823653.
2019-09-11 18:49:35 -05:00
Andrew Brown
d1b481c1ac Merge branch 'marketing-changes' 2019-09-11 18:43:13 -05:00
Andrew Brown
52f2823653 Revert "revert this later"
This reverts commit 289fd0aedc.
2019-09-11 18:42:14 -05:00
Andrew Brown
5b2b24b06b whitespace 2019-09-11 18:41:45 -05:00
AmyMartika
9372831d96 Updated H1 text and styling on landing page 2019-09-11 18:34:53 -05:00
Andrew Brown
a1f47b60f8 fix 500 2019-09-08 16:42:31 -05:00
Andrew Brown
0f971336c1 lets actually try this :) 2019-09-08 14:16:55 -05:00
Andrew Brown
69dcd4f26b eh why not fall back on safety 2019-09-08 01:43:48 -05:00
Andrew Brown
894529a33d do make sure we 500 on users that don't exist though 2019-09-08 01:34:14 -05:00
Andrew Brown
70c299a048 fix 500 on backfilling deleted test accounts 2019-09-08 01:33:28 -05:00
Andrew Brown
021a9acb6c limit memory usage in backfill script 2019-09-08 01:01:43 -05:00
Andrew Brown
a30e4d939e verbiage update 2019-09-08 00:38:38 -05:00
Andrew Brown
8a60048d4b Revert "Bump sidekiq from 5.2.7 to 6.0.0"
This reverts commit c09815eb29.
2019-09-08 00:01:42 -05:00
Andrew Brown
cd3e0326ba
Merge pull request #475 from indentlabs/dependabot/bundler/sidekiq-6.0.0
Bump sidekiq from 5.2.7 to 6.0.0
2019-09-07 23:45:45 -05:00
Andrew Brown
8766f913f5
Merge branch 'master' into dependabot/bundler/sidekiq-6.0.0 2019-09-07 23:43:03 -05:00
Andrew Brown
5baa16b141
Merge pull request #482 from indentlabs/dependabot/bundler/puma-heroku-1.1.0
Bump puma-heroku from 1.0.0 to 1.1.0
2019-09-07 23:40:09 -05:00
Andrew Brown
b61e04bc78
Merge pull request #468 from indentlabs/dependabot/bundler/stripe_event-2.3.0
Bump stripe_event from 2.2.0 to 2.3.0
2019-09-07 23:38:12 -05:00
Andrew Brown
4136874020
Merge pull request #473 from indentlabs/dependabot/bundler/coffee-rails-5.0.0
Bump coffee-rails from 4.2.2 to 5.0.0
2019-09-07 23:38:01 -05:00
Andrew Brown
484530321f
Merge pull request #474 from indentlabs/dependabot/bundler/aws-sdk-s3-1.48.0
Bump aws-sdk-s3 from 1.46.0 to 1.48.0
2019-09-07 23:37:40 -05:00
Andrew Brown
b110203553
Merge pull request #476 from indentlabs/dependabot/bundler/sass-rails-6.0.0
Bump sass-rails from 5.1.0 to 6.0.0
2019-09-07 23:37:01 -05:00
dependabot-preview[bot]
0579972940
Bump puma-heroku from 1.0.0 to 1.1.0
Bumps [puma-heroku](https://github.com/evanphx/puma-heroku) from 1.0.0 to 1.1.0.
- [Release notes](https://github.com/evanphx/puma-heroku/releases)
- [Commits](https://github.com/evanphx/puma-heroku/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-08 04:37:00 +00:00
Andrew Brown
846e59db97
Merge pull request #477 from indentlabs/dependabot/bundler/selenium-webdriver-3.142.4
Bump selenium-webdriver from 3.142.3 to 3.142.4
2019-09-07 23:36:38 -05:00
Andrew Brown
17f4e573fc
Merge pull request #478 from indentlabs/dependabot/bundler/capybara-3.29.0
Bump capybara from 3.28.0 to 3.29.0
2019-09-07 23:36:04 -05:00
Andrew Brown
c712e1155e
Merge pull request #480 from indentlabs/dependabot/bundler/guard-2.15.1
Bump guard from 2.15.0 to 2.15.1
2019-09-07 23:35:54 -05:00
Andrew Brown
5a25410c60
Merge pull request #481 from indentlabs/dependabot/bundler/webmock-3.7.2
Bump webmock from 3.6.2 to 3.7.2
2019-09-07 23:35:33 -05:00
Andrew Brown
e318da1cc1 fix 500 2019-09-07 23:12:17 -05:00
Andrew Brown
d97bba45b9
Merge pull request #483 from indentlabs/sep-7-changes
Sep 7 changes
2019-09-07 23:09:34 -05:00
Andrew Brown
31a28e96e1 Merge branch 'master' into sep-7-changes 2019-09-07 23:07:43 -05:00
Andrew Brown
ea1720c9de
Merge pull request #466 from indentlabs/aug-23-optimizations
Aug 23 optimizations (includes db migration)
2019-09-07 23:01:59 -05:00
Andrew Brown
eda59a2672 backfill fix 2019-09-07 22:48:57 -05:00
Andrew Brown
bd77eefb6f make backfills/position public 2019-09-07 22:17:05 -05:00
Andrew Brown
cdbf9130ba who let this past qa 2019-09-07 21:20:39 -05:00
Andrew Brown
40f9d59ee3 uh, db conflict 2019-09-07 21:11:58 -05:00
Andrew Brown
01d93551d7 Revert "add birthday column to users"
This reverts commit eac5d09786.
2019-09-07 21:03:13 -05:00
Andrew Brown
eac5d09786 add birthday column to users 2019-09-07 20:58:53 -05:00
Andrew Brown
a741316b4e Merge branch 'master' into aug-23-optimizations 2019-09-07 20:30:38 -05:00
Andrew Brown
0a46561ea2 add spoiler tag for account last login ip 2019-09-07 20:13:46 -05:00
Andrew Brown
ae5e9eb91f wrap up recycle bin audit 2019-09-07 20:09:33 -05:00
Andrew Brown
49f7e0d35e helpful message 2019-09-07 20:07:23 -05:00
Andrew Brown
9c1ad65f40 more recycle bin improvements 2019-09-07 20:05:26 -05:00
Andrew Brown
464cb03fa7 display uploaded images attached 2019-09-07 19:46:09 -05:00
Andrew Brown
28fd372a60 add delete-immediately button 2019-09-07 19:40:43 -05:00
Andrew Brown
14c14df4dd recycle bin improvements 2019-09-07 19:33:32 -05:00
Andrew Brown
4ce5976874 code shaking 2019-09-07 19:01:35 -05:00
Andrew Brown
ff386aa9f3 code cleanup 2019-09-07 18:47:32 -05:00
Andrew Brown
703d05d066 simplify logic 2019-09-07 16:52:19 -05:00
Andrew Brown
b109cb689c todos 2019-09-07 16:50:14 -05:00