Browse code Merge branch 'development' into refactor/rspec-specs dev
commit cc184d521c66ab431ed8cd76b3957a6927fc6468 2 parents 93d51a9 + 1d58e22 Brian Riley authored on 2 Aug 2018 GitHub committed on 2 Aug 2018

Showing 23 changed files

• .travis.yml
• Gemfile
• Gemfile.lock
• app/models/org.rb
• app/models/settings/template.rb
• app/models/template.rb
• app/models/user.rb
• app/views/layouts/application.html.erb
• app/views/org_admin/phases/container.html.erb
• app/views/org_admin/sections/_section.html.erb
• bin/setup
• config/database_example.yml
• db/migrate/20180713145319_fix_invalid_mysql_indices.rb
• db/migrate/20180713145547_remove_defaults_from_links.rb
• db/migrate/20180713161007_remove_settings_indices.rb
• db/migrate/20180713164120_add_length_constraints_to_users_email.rb
• db/schema.rb
• lib/assets/javascripts/utils/notificationHelper.js
• lib/assets/javascripts/utils/panelHeading.js
• lib/assets/javascripts/views/org_admin/phases/show.js
• lib/assets/stylesheets/application.scss
• lib/assets/stylesheets/dmproadmap.scss
• lib/assets/stylesheets/overrides.scss

Ignore Space Show notes View .travis.yml

Ignore Space Show notes View Gemfile

Ignore Space Show notes View Gemfile.lock

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

Ignore Space Show notes View app/models/settings/template.rb

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

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

Ignore Space Show notes View app/views/layouts/application.html.erb

Ignore Space Show notes View app/views/org_admin/phases/container.html.erb

Ignore Space Show notes View app/views/org_admin/sections/_section.html.erb

Ignore Space Show notes View bin/setup

Ignore Space Show notes View config/database_example.yml

Ignore Space Show notes View db/migrate/20180713145319_fix_invalid_mysql_indices.rb 0 → 100644

Ignore Space Show notes View db/migrate/20180713145547_remove_defaults_from_links.rb 0 → 100644

Ignore Space Show notes View db/migrate/20180713161007_remove_settings_indices.rb 0 → 100644

Ignore Space Show notes View db/migrate/20180713164120_add_length_constraints_to_users_email.rb 0 → 100644

Ignore Space Show notes View db/schema.rb

Ignore Space Show notes View lib/assets/javascripts/utils/notificationHelper.js

Ignore Space Show notes View lib/assets/javascripts/utils/panelHeading.js

Ignore Space Show notes View lib/assets/javascripts/views/org_admin/phases/show.js

Ignore Space Show notes View lib/assets/stylesheets/application.scss

Ignore Space Show notes View lib/assets/stylesheets/dmproadmap.scss

Ignore Space Show notes View lib/assets/stylesheets/overrides.scss

Show line notes below