Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump addressable from 2.5.2 to 2.8.0 #29

Closed
wants to merge 20 commits into from
Closed

build(deps): bump addressable from 2.5.2 to 2.8.0 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
5322756
Merge branch 'hotfix/1.1.1' into develop
karolsojko Aug 11, 2020
3326389
Merge branch 'hotfix/1.1.2' into develop
karolsojko Aug 11, 2020
0e24c7c
Merge branch 'hotfix/1.1.3' into develop
karolsojko Aug 12, 2020
e74bf55
fix: no csrf
johnny243 Aug 13, 2020
21b6477
Merge pull request #17 from standardnotes/no-csrf
johnny243 Aug 14, 2020
336ef64
Merge branch 'hotfix/1.1.4' into develop
karolsojko Sep 21, 2020
a9d5f49
Merge branch 'hotfix/1.1.5' into develop
karolsojko Sep 21, 2020
9731558
Merge branch 'hotfix/1.1.6' into develop
karolsojko Oct 14, 2020
99b6f8e
Merge branch 'hotfix/1.1.7' into develop
karolsojko Oct 19, 2020
af6fb1b
Merge branch 'hotfix/1.1.8' into develop
karolsojko Oct 23, 2020
90df091
Merge branch 'hotfix/1.1.9' into develop
karolsojko Nov 5, 2020
99d9828
Merge branch 'hotfix/1.1.10' into develop
karolsojko May 5, 2021
4f75322
Merge branch 'hotfix/1.1.11' into develop
karolsojko May 5, 2021
0e6e48a
Merge branch 'hotfix/1.1.12' into develop
karolsojko May 18, 2021
bd6d9a6
build(deps): bump puma from 3.12.6 to 4.3.8 (#24)
dependabot[bot] May 26, 2021
291dcf4
Revert "build(deps): bump puma from 3.12.6 to 4.3.8 (#24)"
karolsojko May 26, 2021
dcfc7ae
Merge branch 'hotfix/1.1.13' into develop
karolsojko May 28, 2021
0804c91
Merge branch 'hotfix/1.1.14' into develop
karolsojko Jun 3, 2021
f9e604c
Merge branch 'hotfix/1.1.15' into develop
karolsojko Jun 4, 2021
864a791
build(deps): bump addressable from 2.5.2 to 2.8.0
dependabot[bot] Jul 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ GEM
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
airbrussh (1.3.0)
sshkit (>= 1.6.1, != 1.7.0)
arel (8.0.0)
Expand Down Expand Up @@ -170,7 +170,7 @@ GEM
premailer-rails (1.10.1)
actionmailer (>= 3, < 6)
premailer (~> 1.7, >= 1.7.9)
public_suffix (3.0.2)
public_suffix (4.0.6)
puma (3.12.6)
rack (2.2.3)
rack-cors (1.0.5)
Expand Down Expand Up @@ -307,7 +307,7 @@ DEPENDENCIES
lograge (~> 0.11.2)
mailcatcher
mysql2 (>= 0.3.13, < 0.5)
newrelic_rpm
newrelic_rpm (~> 7.0)
premailer-rails
puma (~> 3.12)
rack-cors
Expand Down
3 changes: 1 addition & 2 deletions app/controllers/application_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
class ApplicationController < ActionController::Base
protect_from_forgery with: :null_session
class ApplicationController < ActionController::API

before_action {
@title = "FileSend | Simple, encrypted file sharing."
Expand Down