logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 0b34ade66b5271cf7f4e61fb34c4a093ec9fa75d
parent: 191696ab303d83cabf802e804443968b3053d775
Author: Matt Jankowski <mjankowski@thoughtbot.com>
Date:   Mon, 15 May 2017 16:36:45 -0400

Update devise to version 4.3.0 (#3074)

Supports rails 5.1

Diffstat:

MGemfile.lock6+++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock @@ -112,10 +112,10 @@ GEM safe_yaml (~> 1.0.0) crass (1.0.2) debug_inspector (0.0.3) - devise (4.2.1) + devise (4.3.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.1) + railties (>= 4.1.0, < 5.2) responders warden (~> 1.2.3) devise-two-factor (3.0.0) @@ -282,7 +282,7 @@ GEM puma (3.8.2) rabl (0.13.1) activesupport (>= 2.3.14) - rack (2.0.2) + rack (2.0.3) rack-attack (5.0.1) rack rack-cors (0.4.1)