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

Release 5.9 backports #1168

Merged
merged 17 commits into from
Mar 24, 2015
Merged

Release 5.9 backports #1168

merged 17 commits into from
Mar 24, 2015

Conversation

cbeer
Copy link
Member

@cbeer cbeer commented Mar 23, 2015

No description provided.

cbeer and others added 16 commits March 23, 2015 07:42
@cbeer
Backport Blacklight::Document changes for Rails 4.2.1
e87dc71
@mejackreed @cbeer
show add_routes block in comments for clarity
45eaf7a
@jcoyne @cbeer
Update documentation for Catalog#show [ci skip]
1870a8c 
Hightlight the extension framework.
@jcoyne @cbeer
Add documentation to Catalog#additional_response_formats [ci skip]
ae0a916
@cbeer
Rescue request exceptions from setup_previous_and_next_documents_for_…
e2224fb 
…search
@cbeer
The user's view preference must be active to be used
1fabe20
@cbeer
Only rebuild the spec/internal app if the generated app might change
78af05b
@cbeer
Use Solr 4.10.4
62b5652
@cbeer
Gracefully support Rails version differences instead of just doing ve…
da5a9e7 
…rsion checks
@cbeer
Add a more helpful default _home_text.html.erb partial
2d22ad6
@cbeer
Use Blacklight.logger instead of hard-coding Rails.logger
82f4981
@cbeer
Require java 1.7+ for running jetty out of the box
8b088d9
@cbeer
catalog#sms_form should use the #id accessor
8adb2cc
@cbeer
When providing default or backwards-compatible options for a field if…
85238dd 
…/unless condition, don't overwrite the boolean false
@jcoyne @cbeer
Don't pass nil to translation defaults.
a9aeb45 
Workaround for rails/rails#19419
@cbeer
pin to blacklight-marc 5.5
2fb7636
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.0%) to 91.36% when pulling 2fb7636 on release-5.9-backports into 751c0f2 on release-5.9.

@cbeer cbeer mentioned this pull request Mar 23, 2015
Merged
@cbeer cbeer changed the title Release 5.9 backports [WIP] Release 5.9 backports Mar 24, 2015
jcoyne added a commit that referenced this pull request Mar 24, 2015
@jcoyne
Merge pull request #1168 from projectblacklight/release-5.9-backports
dfa2845 
Release 5.9 backports
@jcoyne jcoyne merged commit dfa2845 into release-5.9 Mar 24, 2015
@jcoyne jcoyne deleted the release-5.9-backports branch March 24, 2015 16:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@cbeer @coveralls @jcoyne @mejackreed