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

Jl rails4 upgrade #235

Merged
merged 109 commits into from Dec 10, 2015
Merged

Jl rails4 upgrade #235

merged 109 commits into from Dec 10, 2015

Conversation

jleonardw9
Copy link
Contributor

No description provided.

jleonardw9 and others added 30 commits September 10, 2015 11:25
@jleonardw9
Gemfile issues for upgrade resolved.
a49626b
@jleonardw9
Updating more config files. Resolving has_many issue within Identity …
b8ac581 
…model.
@jleonardw9
Fixing routes file.
ec00b67
@jleonardw9
Completed has_many refactor of models
3eacabe
@jleonardw9
Cache digests gem no longer needed. It is default in Rails 4.
e14de71
@jleonardw9
Reconfiguring ExceptionNotification to Rails 4.
857e1ec
@jleonardw9
Upgrading bin executables.
95094ae
@jleonardw9
Upgrading Audited gem to Rails 4.
6f3d324
@jleonardw9
Apparently find(:all) has been depricated in Rails 4, changed to 'all'.
dd55a50
@marklohr
rescoping models for rails4 compatibility
7a6846e
@jleonardw9
Needed to upgrade acts_as_list for Rails 4 compatibility.
2b06bbf
@jleonardw9
Updated grouped_validations gem.
7b4ebbc
@marklohr
fixed identities_controller and catalogs_controller specs
a32a145
@jleonardw9
Updating queries and fixing service request spec.
4a82431
@marklohr
working through failing controller specs
1a7964f
@marklohr
Merge branch 'jl-rails4_upgrade' of https://github.com/sparc-request/…
4a5c294 
…sparc-request into jl-rails4_upgrade
@jleonardw9
Fixing format problem in associated users controller spec.
dc18a9c
@jleonardw9
Merge branch 'jl-rails4_upgrade' of github.com:sparc-request/sparc-re…
23f1a57 
…quest into jl-rails4_upgrade
@marklohr
fixing formatting problem in notifications_controller_spec
7929126
@marklohr
fixing cross-origin issues in service_calendars_controller_spec
4f69f18
@jleonardw9
Syntax for 'sum' has been simplified in rails 4.
4c02bb3
@jleonardw9
Fixing arm model spec
09e1db1
@jleonardw9
Forgot to add the populate_subjects method back to the fixtures.
fb0331f
@jleonardw9
Fixing sorts for organizations available statuses. Fixed query in app…
81116f8 
…lication helper.
@jleonardw9
Found some specs relating to the old cwf. Refactored them out of the …
4613ad8 
…suite.
@jleonardw9
Update to grouped_options_for_select method in associated surveys par…
169653a 
…tial.
@jleonardw9
Adding in blank pricing setup and rates forms. Setup form currently f…
172f143 
…ailing on date validation.
@marklohr
fixing catalog_manager specs
f25c959
@marklohr
fixing catalog_manager specs
ed90e9b
@marklohr
changed .find to .where for pricing_map_spec
3152628
jleonardw9 and others added 25 commits October 9, 2015 14:02
@jleonardw9
No longer need the optional 'validate' class for pricing setups. Vali…
f874daf 
…dations are now in the model.
add user -> identity_id bug, changed type to 'GET'
65d187b
Merge branch 'jl-rails4_upgrade' of github.com:sparc-request/sparc-re…
06e0bd1 
…quest into jl-rails4_upgrade
@jleonardw9
Test commit
9a590d4
@jleonardw9
Merge branch 'jl-rails4_upgrade' of github.com:sparc-request/sparc-re…
e3303b6 
…quest into jl-rails4_upgrade
@jleonardw9
End of push test.
7a7b084
removed a click event which referenced a no longer utilized popup modal
689bc6d
Merge branch 'jl-rails4_upgrade' of github.com:sparc-request/sparc-re…
35676de 
…quest into jl-rails4_upgrade
@jwiel86
refactored help/faq dialog box, and wrote a spec for it
a6c98e3
@jwiel86
resolving merge conflict
57aca8c
@jleonardw9
Merging master into rails4 upgrade.
242d44c
@jleonardw9
Resolving merge conflicts.
b7b7b8d
@amcates
new deployment for rails 4 and fix to migraiton
b7cedf1
@amcates
adding therubyracer back again
18e9075
@amcates
Merge branch 'master' into jl-rails4_upgrade
731a4f0
@amcates
removing cart help
831f4ec
@jleonardw9
Testing change to grouped_validations gem.
9a50bec
@jleonardw9
Merge branch 'jl-rails4_upgrade' of github.com:sparc-request/sparc-re…
4c3fc98 
…quest into jl-rails4_upgrade
@jleonardw9
Testing complete, placing gemfile in previous state.
289c5d2
@jleonardw9
Updating gemfile
26e4ab4
@jleonardw9
Added file to gitignore
ecc92e5
@jleonardw9
Resolving merge conflicts
c983787
@jleonardw9
Fixing service request controller specs.
8f2d990
@jleonardw9
Fixing specs
b32921b
@jleonardw9
Resolving merge conflicts.
4a43e20
jleonardw9 added a commit that referenced this pull request Dec 10, 2015
@jleonardw9
Merge pull request #235 from sparc-request/jl-rails4_upgrade
7a57e3e 
Jl rails4 upgrade
@jleonardw9 jleonardw9 merged commit 7a57e3e into master Dec 10, 2015
@jleonardw9 jleonardw9 deleted the jl-rails4_upgrade branch December 10, 2015 14:29
@robertjamesmiller
Copy link

This migration fails with Rails 4: MovePositionFromVisitToVisitGroup and I'll try to fix it.

ying-pbrc pushed a commit to PBRCDev/sparc-request that referenced this pull request May 15, 2017
@Stuart-Johnson
Merge pull request sparc-request#235 from bmic-development/kg-modify_…
f6afcce 
…request_submission_bug

KG - Submission Bug When Submitting Request as Catalog Overlord
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.

None yet
5 participants
@jleonardw9 @robertjamesmiller @marklohr @jwiel86 @amcates