| ... | ... | @@ -6,28 +6,28 @@ We will be replacing the `awesim_rails` gem with the `ood_appkit` gem, and updat |
|
|
|
|
|
|
|
#### 2. Update the `Gemfile`
|
|
|
|
|
|
|
|
Update Rails
|
|
|
|
##### Update Rails
|
|
|
|
|
|
|
|
```diff
|
|
|
|
-gem 'rails', '4.0.0'
|
|
|
|
+gem 'rails', '4.1.15'
|
|
|
|
```
|
|
|
|
|
|
|
|
Update `sass-rails`
|
|
|
|
##### Update `sass-rails`
|
|
|
|
|
|
|
|
```diff
|
|
|
|
-gem 'sass-rails', '4.0.2'
|
|
|
|
+gem 'sass-rails', '~> 5.0'
|
|
|
|
```
|
|
|
|
|
|
|
|
Update `bootstrap-sass`
|
|
|
|
##### Update `bootstrap-sass`
|
|
|
|
|
|
|
|
```diff
|
|
|
|
-gem 'bootstrap-sass', '3.3.1.0'
|
|
|
|
+gem 'bootstrap-sass', '~> 3.3'
|
|
|
|
```
|
|
|
|
|
|
|
|
Update OSC gems
|
|
|
|
##### Update OSC gems
|
|
|
|
|
|
|
|
```diff
|
|
|
|
-gem 'osc-machete', '~> 1.0.0', :git => 'git@github.com:OSC/osc-machete.git', :tag => 'v1.0.1'
|
| ... | ... | @@ -38,7 +38,7 @@ Update OSC gems |
|
|
|
+gem 'osc-vnc', '~> 1.1'
|
|
|
|
```
|
|
|
|
|
|
|
|
Add `ood_appkit`, `pbs`, and `awesim_branding` gems
|
|
|
|
##### Add `ood_appkit`, `pbs`, and `awesim_branding` gems
|
|
|
|
|
|
|
|
For details, see:
|
|
|
|
|
| ... | ... | @@ -54,7 +54,9 @@ For details, see: |
|
|
|
+gem 'awesim_branding', :git => 'git@github.com:AweSim-OSC/awesim_branding.git'
|
|
|
|
```
|
|
|
|
|
|
|
|
Remove `awesim_rails` and `awesim_rails_logging` gems, these are not supported on OOD
|
|
|
|
Note: if you do not wish to add the `awesim_branding` gem, you will need to update your application to use the application features in OodAppkit described at https://github.com/OSC/ood_appkit#branding-features
|
|
|
|
|
|
|
|
##### 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'
|
| ... | ... | |