1. 02 Jun, 2016 1 commit
    • Robert Speicher's avatar
      Merge branch 'upgrade-devise-two-factor' into 'master' · 7d33fba7
      Robert Speicher authored
      Upgrade devise, devise-two-factor, and attr_encrypted
      
      Devise 4 includes support for Rails 5, working towards #14286. devise-async doesn't support Devise 4.0 and in 4.1 the bug that was blocking using Devise's built-in ActiveJob integration was fixed. So devise-async is removed. devise-two-factor 3.0.0 is required for Devise 4 support.
      
      attr_encrypted and encryptor are optional but recommended upgrades for devise-two-factor 3.0.0. The mode and algorithm will need to be changed in order to update to attr_encrypted 4.x in the future.
      
      See merge request !4216
      7d33fba7
  2. 01 Jun, 2016 38 commits
  3. 31 May, 2016 1 commit
    • Jacob Schatz's avatar
      Merge branch '17756-close-btn' into 'master' · 473ea1e9
      Jacob Schatz authored
      New style for close buttons
      
      ## What does this MR do?
      Adds new style for all `Close` buttons
      
      ## What are the relevant issue numbers?
      Closes #17756 
      ## Screenshots (if relevant)   
      <img src="/uploads/a1d4cb8c22facb4c170e9cf3b4ae439a/Screen_Shot_2016-05-31_at_2.26.42_PM.png" width="800px">   
      <img src="/uploads/d567694d79ec6bd5da0ff2faf8b262b0/Screen_Shot_2016-05-31_at_2.26.09_PM.png" width="800px">   
      <img src="/uploads/f5e23d8031427079a334d4e03da466b0/Screen_Shot_2016-05-31_at_2.29.01_PM.png" width="800px">   
      
      
      cc @dzaporozhets 
      
      
      See merge request !4388
      473ea1e9