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

Jump to bottom

Hyrax 2.1 upgrade #1529

Merged
merged 17 commits into from
Jul 26, 2018
Merged

Hyrax 2.1 upgrade #1529

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e4b7070
upgrade gemfile and migrations
orangewolf May 24, 2018
bd3ace2
move to wear the ball is going (aka update to rc3), started work on s…
orangewolf May 24, 2018
695e080
more spec fixes
orangewolf Jun 19, 2018
1a2c825
Merge branch 'master' into hyrax_upgrade
orangewolf Jun 27, 2018
6cb8c64
update to hyrax 2.1 proper
orangewolf Jun 27, 2018
ab62b5a
solr_wrapper update, fixes the fact that apache no longer creates md5…
orangewolf Jun 27, 2018
7fc8287
this menu item was removed by hyrax
orangewolf Jun 28, 2018
baf1b6b
dashboard layout is now called hyrax/dashboard layout
orangewolf Jun 28, 2018
7a25390
all collections now have to have collection type
orangewolf Jun 28, 2018
b5e1907
Merge branch 'upstream_master' into hyrax_upgrade
orangewolf Jun 29, 2018
487adcb
remove mac specific ignore, prefer global ignore instead
orangewolf Jul 10, 2018
e8d4cfc
add spec for upgrade migration rake task
orangewolf Jul 10, 2018
f22d6ec
Merge branch 'upstream_master' into hyrax_upgrade
orangewolf Jul 10, 2018
2cfc0cb
you caught me again copper!
orangewolf Jul 10, 2018
b16a657
change directory in a block so the app context is not swapped to a ne…
orangewolf Jul 10, 2018
e9a5eaf
fix extented
orangewolf Jul 11, 2018
e569a3e
add code comment about rack-test version
orangewolf Jul 26, 2018
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ config/environments/*.local.yml

# Avatars and such
public/uploads
.DS_Store
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be in your global ignore https://help.github.com/articles/ignoring-files/#create-a-global-gitignore as this is specific only to certain operating systems and it not part of the project.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no problem

3 changes: 2 additions & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ group :test do
gem 'chromedriver-helper'
gem 'database_cleaner'
gem 'factory_girl_rails'
gem 'rack-test', '0.7.0'
gem 'rails-controller-testing'
gem 'selenium-webdriver'
gem 'webmock'
Expand All @@ -75,7 +76,7 @@ end

gem 'blacklight', '~> 6.7'

gem 'hyrax', '2.0.2'
gem 'hyrax', '2.1.0'
gem 'rsolr', '~> 2.0'

gem 'devise'
Expand Down
Loading