Timeline dates

.gitignore

@@ -1,37 +1,49 @@
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 #
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile ~/.gitignore_global
 
-# Ignore bundler config
-/.bundle
-
-# Ignore the default SQLite database.
-/db/*.sqlite3
-/config/database.yml
-
-# Ignore all logfiles and tempfiles.
-/log/*
-/tmp/*
-*.DS_Store
-.DS_Store
 *.rbc
-*.sassc
-.sass-cache
 capybara-*.html
 .rspec
-/.bundle
-/vendor/bundle
+/log
+/tmp
 /db/*.sqlite3
-/public/system/*
+/db/*.sqlite3-journal
+/db/dumps/**
+/public/system
 /coverage/
-/spec/tmp/*
+/spec/tmp
 **.orig
 rerun.txt
 pickle-email-*.html
-/db/dumps
 
-.powrc.swp
+# TODO Comment out these rules if you are OK with secrets being uploaded to the repo
+config/initializers/secret_token.rb
+config/secrets.yml
 
+## Environment normalisation:
+/.bundle
+/vendor/bundle
+
+# these should all be checked in to normalise the environment:
+# Gemfile.lock, .ruby-version, .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
+
+# if using bower-rails ignore default bower_components path bower.json files
+/vendor/assets/bower_components
+*.bowerrc
+bower.json
+
+# Ignore pow environment settings
+.powenv
+
+.gems/**
+/.gems/**
+
+.DS_Store
+
+config/application.yml
+.powrc.swp
 .ruby-version
+discover.dump

.rbenv-gemsets

@@ -0,0 +1 @@
+.gems

.ruby-version

@@ -0,0 +1 @@
+2.0.0-p647

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 ruby '2.0.0'
-gem 'rails', '3.2.20'
+gem 'rails', '3.2.22'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
@@ -23,6 +23,7 @@ gem 'jquery-ui-rails'
 gem 'multi_json'
 gem 'newrelic_rpm'
 gem 'pg'
+gem "puma"
 gem 'rails_autolink'
 gem 'rails_12factor'
 gem 'ranked-model'
@@ -31,7 +32,6 @@ gem 'omniauth'
 gem 'omniauth-facebook'
 gem 'omniauth-twitter'
 gem 'rake', '~> 10.3.1'
-gem 'unicorn'
 gem 'will_paginate', '~> 3.0'
 
 # Gems used only for assets and not required

Gemfile.lock

@@ -1,31 +1,31 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.20)
-      actionpack (= 3.2.20)
+    actionmailer (3.2.22)
+      actionpack (= 3.2.22)
       mail (~> 2.5.4)
-    actionpack (3.2.20)
-      activemodel (= 3.2.20)
-      activesupport (= 3.2.20)
+    actionpack (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
       rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.20)
-      activesupport (= 3.2.20)
+    activemodel (3.2.22)
+      activesupport (= 3.2.22)
       builder (~> 3.0.0)
-    activerecord (3.2.20)
-      activemodel (= 3.2.20)
-      activesupport (= 3.2.20)
+    activerecord (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.20)
-      activemodel (= 3.2.20)
-      activesupport (= 3.2.20)
-    activesupport (3.2.20)
+    activeresource (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
+    activesupport (3.2.22)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     acts_as_paranoid (0.4.2)
@@ -82,22 +82,21 @@ GEM
       railties (>= 3.1, < 4.1)
     hashie (2.1.1)
     hike (1.2.3)
-    i18n (0.6.11)
+    i18n (0.7.0)
     journey (1.0.4)
     jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (4.2.1)
       railties (>= 3.2.16)
-    json (1.8.1)
+    json (1.8.3)
     jwt (0.1.11)
       multi_json (>= 1.5)
-    kgio (2.9.2)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
-    multi_json (1.10.1)
+    multi_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     newrelic_rpm (3.8.0.218)
@@ -127,36 +126,36 @@ GEM
     orm_adapter (0.5.0)
     pg (0.17.1)
     polyglot (0.3.5)
-    rack (1.4.5)
-    rack-cache (1.2)
+    puma (2.15.3)
+    rack (1.4.7)
+    rack-cache (1.5.1)
       rack (>= 0.4)
     rack-ssl (1.3.4)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.2.20)
-      actionmailer (= 3.2.20)
-      actionpack (= 3.2.20)
-      activerecord (= 3.2.20)
-      activeresource (= 3.2.20)
-      activesupport (= 3.2.20)
+    rails (3.2.22)
+      actionmailer (= 3.2.22)
+      actionpack (= 3.2.22)
+      activerecord (= 3.2.22)
+      activeresource (= 3.2.22)
+      activesupport (= 3.2.22)
       bundler (~> 1.0)
-      railties (= 3.2.20)
+      railties (= 3.2.22)
     rails_12factor (0.0.2)
       rails_serve_static_assets
       rails_stdout_logging
     rails_autolink (1.1.5)
       rails (> 3.1)
     rails_serve_static_assets (0.0.2)
     rails_stdout_logging (0.0.3)
-    railties (3.2.20)
-      actionpack (= 3.2.20)
-      activesupport (= 3.2.20)
+    railties (3.2.22)
+      actionpack (= 3.2.22)
+      activesupport (= 3.2.22)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    raindrops (0.13.0)
     rake (10.3.2)
     ranked-model (0.4.0)
       activerecord (>= 3.1.12)
@@ -178,14 +177,10 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.42)
+    tzinfo (0.3.45)
     uglifier (2.5.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    unicorn (4.8.2)
-      kgio (~> 2.6)
-      rack
-      raindrops (~> 0.7)
     warden (1.2.3)
       rack (>= 1.0)
     will_paginate (3.0.5)
@@ -216,12 +211,18 @@ DEPENDENCIES
   omniauth-facebook
   omniauth-twitter
   pg
-  rails (= 3.2.20)
+  puma
+  rails (= 3.2.22)
   rails_12factor
   rails_autolink
   rake (~> 10.3.1)
   ranked-model
   sass-rails (~> 3.2.3)
   uglifier (>= 1.0.3)
-  unicorn
   will_paginate (~> 3.0)
+
+RUBY VERSION
+   ruby 2.0.0p648
+
+BUNDLED WITH
+   1.13.3

Procfile

@@ -1,3 +1,3 @@
-web:	bundle exec unicorn -p $PORT -c ./config/unicorn.rb
+web: 	bundle exec puma -C config/puma.rb
 worker:	bundle exec rake jobs:work
 clock: 	bundle exec clockwork ./lib/clock.rb

Rakefile

@@ -4,4 +4,4 @@
 
 require File.expand_path('../config/application', __FILE__)
 
-DiscoverbpsV2::Application.load_tasks
+DiscoverBPS::Application.load_tasks

app/views/students/page_elements/_footer_links.html.haml → _footer_links.html.haml

@@ -9,10 +9,11 @@
 		.alignleft_half
 			%h2{style: 'margin-bottom: 15px;'}
 				Visit Schools
-			= link_to 'Learn about school preview opportunities', 'http://www.bostonpublicschools.org/Page/652', class: 'u', target: '_blank'
+			= link_to 'Learn about school preview opportunities', 'http://www.bostonpublicschools.org/schoolpreview', class: 'u', target: '_blank'
 		.alignleft_half
 			%h2{style: 'margin-bottom: 15px;'}
 				Register
-			= link_to 'Pre-registration', 'https://sis.mybps.org/aspen/index.html', class: 'u', target: '_blank'
-			= link_to 'Collect the required documents', 'http://www.bostonpublicschools.org/requireddocs', class: 'u', target: '_blank'
-			= link_to 'Plan a visit to a welcome center', 'http://www.bostonpublicschools.org/Page/653', class: 'u', target: '_blank'
+			= link_to 'Pre-registration', 'https://sis.mybps.org/aspen/index.html', class: 'u', target: '_blank'	
+			%div.font13 Pre-registration for the 2018-2019 school year begins December
+			= link_to 'Collect the required documents', 'http://www.bostonpublicschools.org/residencypolicy', class: 'u', target: '_blank'
+			= link_to 'Plan a visit to a welcome center', 'http://www.bostonpublicschools.org/welcomecenters', class: 'u', target: '_blank'