| ... | ... | @@ -2,49 +2,55 @@ |
|
|
|
* Use rubygems.org gems when possible
|
|
|
|
* Dataroot changes
|
|
|
|
|
|
|
|
### `Gemfile`
|
|
|
|
Due to changes in the OOD gems, OOD applications will need to have a minimum Rails version of **`4.1.15`**, you can also update to the latest version of Rails **`4.2`**. Rails 5.0 is not yet supported.
|
|
|
|
|
|
|
|
We will be replacing the `awesim_rails` gem with the `ood_appkit` gem, and updating the rest of the OOD dependencies to work with the latest version of OodAppkit.
|
|
|
|
|
|
|
|
#### 1. Clone the existing app to `/awesim/share`
|
|
|
|
|
|
|
|
#### 2. Update the `Gemfile`
|
|
|
|
|
|
|
|
Update Rails
|
|
|
|
|
|
|
|
```diff
|
|
|
|
-gem 'rails', '4.0.0'
|
|
|
|
+gem 'rails', '4.1.16'
|
|
|
|
+gem 'rails', '4.1.15'
|
|
|
|
```
|
|
|
|
|
|
|
|
Update `sass-rails`
|
|
|
|
|
|
|
|
```diff
|
|
|
|
-gem 'sass-rails', '4.0.2'
|
|
|
|
+gem 'sass-rails', '5.0.3'
|
|
|
|
+gem 'sass-rails', '~> 5.0'
|
|
|
|
```
|
|
|
|
|
|
|
|
Update `bootstrap-sass`
|
|
|
|
|
|
|
|
```diff
|
|
|
|
-gem 'bootstrap-sass', '3.3.1.0'
|
|
|
|
+gem 'bootstrap-sass', '3.3.5.0'
|
|
|
|
+gem 'bootstrap-sass', '~> 3.3'
|
|
|
|
```
|
|
|
|
|
|
|
|
Update OSC gems
|
|
|
|
|
|
|
|
```diff
|
|
|
|
-gem 'osc-machete', '~> 1.0.0', :git => 'git@github.com:OSC/osc-machete.git', :tag => 'v1.0.1'
|
|
|
|
+gem 'osc-machete', '~> 1.2.0', :git => 'git@github.com:OSC/osc-machete.git', :tag => 'v1.2.0'
|
|
|
|
+gem 'osc-machete', '~> 1.2'
|
|
|
|
-gem 'osc_machete_rails', '~> 1.0.0', :git => 'git@github.com:OSC/osc_machete_rails.git', :tag => 'v1.0.1'
|
|
|
|
+gem 'osc_machete_rails', '~> 1.2.2', :git => 'git@github.com:OSC/osc_machete_rails.git', :tag => 'v1.2.2'
|
|
|
|
+gem 'osc_machete_rails', '~> 1.2'
|
|
|
|
-gem 'osc-vnc', '~> 1.0.0', :git => 'git@github.com:OSC/osc-vnc.git', :tag => 'v1.0.8'
|
|
|
|
+gem 'osc-vnc', '~> 1.1.2', :git => 'git@github.com:OSC/osc-vnc.git', :tag => 'v1.1.2'
|
|
|
|
+gem 'osc-vnc', '~> 1.1'
|
|
|
|
```
|
|
|
|
|
|
|
|
Add `ood_appkit`, `pbs`, and `awesim_branding` gems
|
|
|
|
|
|
|
|
```diff
|
|
|
|
+gem 'ood_appkit', '~> 0.3.0', :git => 'git@github.com:OSC/ood_appkit.git', :tag => 'v0.3.0'
|
|
|
|
+gem 'pbs', '~> 2.0.2', :git => 'git@github.com:OSC/pbs-ruby.git', :tag => 'v2.0.2'
|
|
|
|
+gem 'ood_appkit', '~> 0.3.0'
|
|
|
|
+gem 'pbs', '~> 2.0'
|
|
|
|
+gem 'awesim_branding', :git => 'git@github.com:AweSim-OSC/awesim_branding.git'
|
|
|
|
```
|
|
|
|
|
|
|
|
Remove `awesim_rails` and `awesim_rails_logging` gems
|
|
|
|
Remove `awesim_rails` and `awesim_rails_logging` gems, these are not supported on OOD
|
|
|
|
|
|
|
|
```diff
|
|
|
|
-gem 'awesim_rails', '~> 1.0.0', :git => 'git@github.com:AweSim-OSC/awesim_rails.git', :tag => 'v1.0.0'
|
| ... | ... | @@ -66,7 +72,7 @@ Examples: |
|
|
|
Run Bundler
|
|
|
|
|
|
|
|
```
|
|
|
|
$ bin/bundle install --path=vendor/bundle
|
|
|
|
$ scl enable git19 rh-ruby22 -- bin/bundle install --path=vendor/bundle
|
|
|
|
```
|
|
|
|
|
|
|
|
## Test Changes
|
| ... | ... | |