{"shas":[["ecf2f4986a03980f1377f181273db927f74449a3","2591e5f46f28d303f9dc027d475a5c60d8dea17a@cantina.co","has_many_polymorphs association was incomplete on portal/school model","Dan Barron"],["adb110e26772cf2706a7d0de02dd9e9d9414dffb","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","Merge branch 'xproject-dev' into merge_xproject_dev","Noah Paessel"],["e6d6b36d280835134fd6b34750fd5e1c1a79ca39","2591e5f46f28d303f9dc027d475a5c60d8dea17a@cantina.co","renamed title helper to title_tag to avoid namespace clashes with title attribute in tests","Dan Barron"],["641e59bd0ece51d5f090383f3a7a9baafce58654","2591e5f46f28d303f9dc027d475a5c60d8dea17a@cantina.co","re-added conditional logic to _runnable_list partials for authors. all test are green now","Dan Barron"],["0c4bd58d32fc43e23528adc5313d9c6c887a94a1","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","Cherry pick from itsisu f2cfa2d67f4e1d use bundler\n\nConflicts manually adjusted. Mistakenly took the wrong\nacivities listing(!)\n\nConflicts:\n\n\t.gitignore\n\tconfig/deploy.rb\n\tconfig/environment.rb\n\tconfig/environments/cucumber.rb\n\tconfig/environments/test.rb\n\tthemes/itsisu/views/activities/_runnable_list.html.haml\n\tvendor/gems/ar-extensions-0.9.2/.specification\n\tvendor/gems/arrayfields-4.7.4/.specification\n\tvendor/gems/capistrano-2.5.5/.specification\n\tvendor/gems/capistrano-ext-1.2.1/.specification\n\tvendor/gems/chriseppstein-compass-0.6.3/.specification\n\tvendor/gems/diff-lcs-1.1.2/.specification\n\tvendor/gems/echoe-3.1.1/.specification\n\tvendor/gems/fastercsv-1.5.0/.specification\n\tvendor/gems/ffi-ncurses-0.3.2.1/.specification\n\tvendor/gems/grit-2.0.0/.specification\n\tvendor/gems/haml-2.2.0/.specification\n\tvendor/gems/has_many_polymorphs-2.13/.specification\n\tvendor/gems/highline-1.5.2/.specification\n\tvendor/gems/httpclient-2.1.5.2/.specification\n\tvendor/gems/jnlp-0.6.1/.specification\n\tvendor/gems/josevalim-rails-footnotes-3.6.2/.specification\n\tvendor/gems/mime-types-1.16/.specification\n\tvendor/gems/mislav-will_paginate-2.3.6/.specification\n\tvendor/gems/net-scp-1.0.2/.specification\n\tvendor/gems/net-sftp-2.0.2/.specification\n\tvendor/gems/net-ssh-2.0.15/.specification\n\tvendor/gems/net-ssh-gateway-1.0.1/.specification\n\tvendor/gems/open4-0.9.6/.specification\n\tvendor/gems/prawn-0.4.1/.specification\n\tvendor/gems/prawn-format-0.1.1/.specification\n\tvendor/gems/prawn-layout-0.1.0/.specification\n\tvendor/gems/rack-1.0.0/.specification\n\tvendor/gems/ruby-ole-1.2.8.2/.specification\n\tvendor/gems/rubyforge-1.0.3/.specification\n\tvendor/gems/rubyist-aasm-2.0.5/.specification\n\tvendor/gems/spreadsheet-0.6.3.1/.specification\n\tvendor/gems/thoughtbot-factory_girl-1.2.2/.specification\n\tvendor/gems/uuidtools-2.0.0/.specification","Noah Paessel"],["678c27b5f685ddbc375dd68b729dd0ba11100477","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","remove has_many_polymorphs\n\nLocal conflicts were trivial\n\n\tapp/models/portal/school.rb","Noah Paessel"],["89170b96086f640cdd72385c90423a5ebfa159b9","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","ignore local_files directory, for stashing good things","Noah Paessel"],["4b8e1c6aa2544eb558e429a47f8dd2dff61da26d","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","This file is not required -- and causes problems.\n\nInadvertantly added by Noah and Ethan a while back","Noah Paessel"],["5db330227a7440760cc9c85a0c953173eef4b744","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","HAML update doesn't like quotes in url properties.","Noah Paessel"],["041bd7a2378a9014059590cb6425ac31d4a16221","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","Add Rites Banner.","Noah Paessel"],["aec9c094cd32dd5754cf5b80de254c990bb25ccf","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","Fix student Signup Link. ( was stduents/new )","Noah Paessel"],["eb61b33b8aa10674f405a8a40f064bb6067b3b76","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","Factor out commpon components in Layouts","Noah Paessel"],["e6294327468034199ebeccef5fa8ca6b2582d5de","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","Remove rites CSS for now.","Noah Paessel"],["d33f426ca22558719fd545ea8790a10981dd3784","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","Clean whitespace.","Noah Paessel"],["c973f025b17d77779ee0eb129c8003ea05e01322","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","Cherry pick from itsisu f2cfa2d67f4e1d use bundler\n\nConflicts manually adjusted. Mistakenly took the wrong\nacivities listing(!)\n\nConflicts:\n\n\t.gitignore\n\tconfig/deploy.rb\n\tconfig/environment.rb\n\tconfig/environments/cucumber.rb\n\tconfig/environments/test.rb\n\tthemes/itsisu/views/activities/_runnable_list.html.haml\n\tvendor/gems/ar-extensions-0.9.2/.specification\n\tvendor/gems/arrayfields-4.7.4/.specification\n\tvendor/gems/capistrano-2.5.5/.specification\n\tvendor/gems/capistrano-ext-1.2.1/.specification\n\tvendor/gems/chriseppstein-compass-0.6.3/.specification\n\tvendor/gems/diff-lcs-1.1.2/.specification\n\tvendor/gems/echoe-3.1.1/.specification\n\tvendor/gems/fastercsv-1.5.0/.specification\n\tvendor/gems/ffi-ncurses-0.3.2.1/.specification\n\tvendor/gems/grit-2.0.0/.specification\n\tvendor/gems/haml-2.2.0/.specification\n\tvendor/gems/has_many_polymorphs-2.13/.specification\n\tvendor/gems/highline-1.5.2/.specification\n\tvendor/gems/httpclient-2.1.5.2/.specification\n\tvendor/gems/jnlp-0.6.1/.specification\n\tvendor/gems/josevalim-rails-footnotes-3.6.2/.specification\n\tvendor/gems/mime-types-1.16/.specification\n\tvendor/gems/mislav-will_paginate-2.3.6/.specification\n\tvendor/gems/net-scp-1.0.2/.specification\n\tvendor/gems/net-sftp-2.0.2/.specification\n\tvendor/gems/net-ssh-2.0.15/.specification\n\tvendor/gems/net-ssh-gateway-1.0.1/.specification\n\tvendor/gems/open4-0.9.6/.specification\n\tvendor/gems/prawn-0.4.1/.specification\n\tvendor/gems/prawn-format-0.1.1/.specification\n\tvendor/gems/prawn-layout-0.1.0/.specification\n\tvendor/gems/rack-1.0.0/.specification\n\tvendor/gems/ruby-ole-1.2.8.2/.specification\n\tvendor/gems/rubyforge-1.0.3/.specification\n\tvendor/gems/rubyist-aasm-2.0.5/.specification\n\tvendor/gems/spreadsheet-0.6.3.1/.specification\n\tvendor/gems/thoughtbot-factory_girl-1.2.2/.specification\n\tvendor/gems/uuidtools-2.0.0/.specification","Noah Paessel"],["4a24445541fbe5e54382c01475d65a3671a60c1d","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","Update lockfile after bundle install","Noah Paessel"],["a26f42fb77e92401dc75cf584149696c9da2a1fb","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","remove has_many_polymorphs\n\nLocal conflicts were trivial\n\n\tapp/models/portal/school.rb","Noah Paessel"],["2175298b12318974fd4fdba6e97d4de0d6115bbb","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","This file is not required -- and causes problems.\n\nInadvertantly added by Noah and Ethan a while back","Noah Paessel"],["59020f5ee8591b98ab3f2dd0c5952aa143b8240b","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","HAML update doesn't like quotes in url properties.","Noah Paessel"],["6b70fd00608422aa6fd019439b1f46245e4f0a53","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","Fix student Signup Link. ( was stduents/new )","Noah Paessel"]],"repo":"stepheneb/rigse","actor":"knowuh","ref":"refs/heads/itsisu-dev","size":201,"head":"2a5f26f91cd5a037e0bf2f16f9042248913a3389","actor_gravatar":"9232505d592cae5f257fa1c04942877b","push_id":27900486}