Browse code Merge branch 'development' into issue_2418 dev
commit 8a70d0e9d797962c5b04a61198b13f9a4e7be634 2 parents e757ade + b3801d1 Brian Riley authored on 18 Mar 2020 GitHub committed on 18 Mar 2020

Showing 15 changed files

• app/assets/stylesheets/utils/_margins.scss
• app/controllers/usage_controller.rb
• app/helpers/usage_helper.rb
• app/javascript/views/usage/index.js
• app/models/stat_created_plan.rb
• app/models/stat_created_plan/create_or_update.rb
• app/views/usage/_filter.html.erb
• app/views/usage/_plans_by_template_chart.html.erb
• app/views/usage/_template_statistics.html.erb
• app/views/usage/_total_usage.html.erb
• app/views/usage/_user_statistics.html.erb
• app/views/usage/index.html.erb
• spec/controllers/usage_controller_spec.rb
• spec/services/org/create_created_plan_service_spec.rb
• spec/services/org/create_last_month_created_plan_service_spec.rb

Ignore Space Show notes View app/assets/stylesheets/utils/_margins.scss

Ignore Space Show notes View app/controllers/usage_controller.rb

Ignore Space Show notes View app/helpers/usage_helper.rb

Ignore Space Show notes View app/javascript/views/usage/index.js

Ignore Space Show notes View app/models/stat_created_plan.rb

Ignore Space Show notes View app/models/stat_created_plan/create_or_update.rb

Ignore Space Show notes View app/views/usage/_filter.html.erb

Ignore Space Show notes View app/views/usage/_plans_by_template_chart.html.erb

Ignore Space Show notes View app/views/usage/_template_statistics.html.erb 0 → 100644

Ignore Space Show notes View app/views/usage/_total_usage.html.erb

Ignore Space Show notes View app/views/usage/_user_statistics.html.erb 0 → 100644

Ignore Space Show notes View app/views/usage/index.html.erb

Ignore Space Show notes View spec/controllers/usage_controller_spec.rb

Ignore Space Show notes View spec/services/org/create_created_plan_service_spec.rb

Ignore Space Show notes View spec/services/org/create_last_month_created_plan_service_spec.rb

Show line notes below