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

7.3 upgrade #164

Merged
merged 2 commits into from
Mar 27, 2017
Merged

7.3 upgrade #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04acde4
Run through upgrade steps and change user.to_s method
bmquinn Mar 24, 2017
7b30a81
Run 'rails generate qa:local:tables' and mount QA::Engine in routes
bmquinn Mar 27, 2017
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
3 changes: 0 additions & 3 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ gem 'sinatra', :require => nil

gem 'sufia', '~> 7.0'

# Sufia 7.2.0 depends upon an unreleased version of Flipflop -- we're working with the maintainer of that gem to get some pull requests that are required to make it work with a Rails engine like Sufia.
gem 'flipflop', git: 'https://github.com/jcoyne/flipflop.git', branch: 'hydra'

# Admin users enabled by hydra-role-management
gem 'hydra-role-management'

Expand Down
Loading