GitBucket
|
fixed merge conflicts
|
|---|
briley
authored
on 6 Sep 2017
|
| app/controllers/roles_controller.rb |
|---|
| app/models/settings/template.rb |
|---|
| app/models/user.rb |
|---|
| app/views/devise/registrations/new.html.erb |
|---|
| app/views/layouts/_es5_scripts.html.erb |
|---|
| app/views/plans/_edit_details.html.erb |
|---|
| app/views/plans/_show_details.html.erb |
|---|
| app/views/plans/show.html.erb |
|---|
| app/views/shared/_plan_navigation.html.erb |
|---|
| db/migrate/20170702012742_ensure_indexes_in_place.rb |
|---|
| db/seeds.rb |
|---|
| lib/assets/.eslintrc.json |
|---|
| lib/assets/javascripts/application.js |
|---|
| lib/assets/javascripts/utils/tinymce.js 0 → 100644 |
|---|
| lib/assets/javascripts/utils/tinymceSpec.js 0 → 100644 |
|---|
| lib/assets/javascripts/views/plans/edit_details.js 0 → 100644 |
|---|
| lib/assets/karma.conf.js |
|---|
| lib/assets/webpack.config.js |
|---|
| lib/tasks/bugfix.rake 0 → 100644 |
|---|
| test/functional/roles_controller_test.rb |
|---|