-
-
Save tongueroo/955f5b549d8d9ae1043a to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| walle:breport (qa_rc_tongueroo|MERGING) $ git co -f | |
| walle:breport (qa_rc_tongueroo) $ git co rc | |
| Switched to branch 'rc' | |
| walle:breport (rc) $ git co -b rc-7492-allow-transparent-skins chrispederick/rc-7492-allow-transparent-skins | |
| Branch rc-7492-allow-transparent-skins set up to track remote branch rc-7492-allow-transparent-skins from chrispederick. | |
| Switched to a new branch 'rc-7492-allow-transparent-skins' | |
| walle:breport (rc-7492-allow-transparent-skins) $ gitc pull | |
| Retrieving branch information from gitcycle. | |
| Retrieving repo information from gitcycle. | |
| Adding remote repo 'br/breport'. | |
| Fetching remote 'br'. | |
| walle:breport (rc-7492-allow-transparent-skins) $ git st | |
| # On branch rc-7492-allow-transparent-skins | |
| nothing to commit (working directory clean) | |
| walle:breport (rc-7492-allow-transparent-skins) $ git merge br/rc | |
| Removing app/controllers/scores_controller.rb | |
| Removing app/controllers/standings_controller.rb | |
| Auto-merging public/javascripts/redesign/common/common.js | |
| CONFLICT (content): Merge conflict in public/javascripts/redesign/common/common.js | |
| Removing public/pkg/javascripts/839789ac_cmservice.js | |
| Removing public/pkg/javascripts/d543c821_redesign_front_page.js | |
| Removing public/pkg/stylesheets/3735aa20_redesign_cobranding_la_times.css | |
| Removing public/pkg/stylesheets/8a94cce6_redesign_mybr.css | |
| Automatic merge failed; fix conflicts and then commit the result. | |
| walle:breport (rc-7492-allow-transparent-skins|MERGING) $ git st | |
| # On branch rc-7492-allow-transparent-skins | |
| # Changes to be committed: | |
| # | |
| # modified: app/controllers/admin/cms_controller.rb | |
| # new file: app/controllers/api/image_controller.rb | |
| # modified: app/controllers/api/mobile_controller.rb | |
| # modified: app/controllers/front_page_controller.rb | |
| # deleted: app/controllers/scores_controller.rb | |
| # new file: app/controllers/sections/stats_controller.rb | |
| # deleted: app/controllers/standings_controller.rb | |
| # modified: app/controllers/sweepstakes_controller.rb | |
| # modified: app/models/engaged_reader.rb | |
| # modified: app/models/geodb.rb | |
| # modified: app/models/reward/leaderboard_reward.rb | |
| # modified: app/models/tag.rb | |
| # modified: app/models/user_ext/leveling.rb | |
| # modified: app/views/admin/team_newsletters/_email_template.erb | |
| # modified: app/views/articles/related_content/_a_simple.html.erb | |
| # modified: app/views/common/ads/_mobile_top.html.erb | |
| # modified: app/views/common/modules/_lead_nfl1000.html.erb | |
| # modified: app/views/common/modules/_social_module.html.erb | |
| # modified: app/views/common/modules/_uber_module.html.erb | |
| # modified: app/views/common/modules/_uber_stream.html.erb | |
| # new file: app/views/common/modules/stats/_scores.html.erb | |
| # renamed: app/views/common/modules/_standings.html.erb -> app/views/common/modules/stats/_standings.html.erb | |
| # modified: app/views/front_page/index.html.erb | |
| # modified: app/views/front_page/team_stream_test.html.erb | |
| # modified: app/views/layouts/bleacherreport/header/_mobile.html.erb | |
| # modified: app/views/layouts/cobrands/la_times/_footer.html.erb | |
| # modified: app/views/layouts/cobrands/la_times/_for_foot.html.erb | |
| # modified: app/views/layouts/cobrands/la_times/_for_head.html.erb | |
| # modified: app/views/layouts/cobrands/la_times/_header.html.erb | |
| # modified: app/views/layouts/mobile.html.erb | |
| # modified: app/views/sections/cmservice.html.erb | |
| # new file: app/views/sections/stats/mobile_scores.html.erb | |
| # renamed: app/views/standings/mobile_show.html.erb -> app/views/sections/stats/mobile_standings.html.erb | |
| # new file: app/views/sections/stats/scores.html.erb | |
| # renamed: app/views/standings/show.html.erb -> app/views/sections/stats/standings.html.erb | |
| # modified: app/views/sections/stream/_stream_item.html.erb | |
| # modified: app/views/sections/teams/show.html.erb | |
| # modified: app/views/sections/teams/show_team_redesign.html.erb | |
| # new file: bin/fix/fix_wrong_tag.rb | |
| # modified: bin/import/last_week | |
| # new file: bin/test_push_notification.rb | |
| # modified: config/assets.yml | |
| # modified: config/cms/schema.yml | |
| # modified: config/cms/templates.yml | |
| # modified: config/initializers/apns.rb | |
| # modified: config/routes.rb | |
| # modified: config/schedule.rb | |
| # modified: config/timed_config.yml | |
| # new file: db/migrate/20120222014720_update_tsn_id_type.rb | |
| # modified: lib/ad_container.rb | |
| # modified: lib/deprecated_paperclip_url.rb | |
| # modified: lib/push_notification_sender.rb | |
| # modified: lib/tasks/br.rake | |
| # modified: lib/video_support.rb | |
| # new file: public/images/redesign/modules/uber-module/ts_macaulayculkin.png | |
| # modified: public/javascripts/redesign/admin/cms.js | |
| # modified: public/javascripts/redesign/admin/front-page/front-page.js | |
| # modified: public/javascripts/redesign/analytics/recon.js | |
| # new file: public/javascripts/redesign/analytics/yt.js | |
| # modified: public/javascripts/redesign/front-page/team_stream.js | |
| # modified: public/javascripts/redesign/jquery/cycle.multipleelements.js | |
| # renamed: public/pkg/javascripts/9a6e3af3_redesign_newsletter_static.js -> public/pkg/javascripts/06af815d_redesign_newsletter_static.js | |
| # renamed: public/pkg/javascripts/ae933ea4_redesign_admin_front_page.js -> public/pkg/javascripts/4c43361b_redesign_admin_front_page.js | |
| # renamed: public/pkg/javascripts/32703939_redesign_common.js -> public/pkg/javascripts/79be5273_redesign_common.js | |
| # deleted: public/pkg/javascripts/839789ac_cmservice.js | |
| # new file: public/pkg/javascripts/b9ace7ca_redesign_front_page.js | |
| # new file: public/pkg/javascripts/cf3beef4_cmservice.js | |
| # deleted: public/pkg/javascripts/d543c821_redesign_front_page.js | |
| # new file: public/pkg/stylesheets/01e47f67_redesign_cobranding_la_times.css | |
| # new file: public/pkg/stylesheets/1498006b_redesign_mybr.css | |
| # renamed: public/pkg/stylesheets/d8f69b83_redesign_common.css -> public/pkg/stylesheets/1a2686b2_redesign_common.css | |
| # deleted: public/pkg/stylesheets/3735aa20_redesign_cobranding_la_times.css | |
| # renamed: public/pkg/stylesheets/d136e548_redesign_mobile_embedded.css -> public/pkg/stylesheets/5a7d9dd5_redesign_mobile_embedded.css | |
| # renamed: public/pkg/stylesheets/04c842d0_redesign_mobile.css -> public/pkg/stylesheets/5f628f7f_redesign_mobile.css | |
| # deleted: public/pkg/stylesheets/8a94cce6_redesign_mybr.css | |
| # renamed: public/pkg/stylesheets/5318fdc2_redesign_tablet.css -> public/pkg/stylesheets/b8a17dd1_redesign_tablet.css | |
| # renamed: public/pkg/stylesheets/a4866fb6_redesign_newsletter_static.css -> public/pkg/stylesheets/c3b8b63d_redesign_newsletter_static.css | |
| # renamed: public/pkg/stylesheets/2b0ee831_redesign_cobranding.css -> public/pkg/stylesheets/e30b36bc_redesign_cobranding.css | |
| # modified: public/stylesheets/redesign/cobranding/la-times.css | |
| # modified: public/stylesheets/redesign/common/modules.css | |
| # modified: public/stylesheets/redesign/mybr/mybr.css | |
| # modified: vendor/plugins/bronto/config/bronto.yml | |
| # modified: vendor/plugins/bronto/lib/bronto.rb | |
| # modified: vendor/plugins/justintv-apns/lib/apns/core.rb | |
| # modified: vendor/plugins/paperclip/lib/paperclip/attachment.rb | |
| # | |
| # Unmerged paths: | |
| # (use "git add/rm <file>..." as appropriate to mark resolution) | |
| # | |
| # both modified: public/javascripts/redesign/common/common.js | |
| # | |
| walle:breport (rc-7492-allow-transparent-skins|MERGING) $ git st | |
| # On branch rc-7492-allow-transparent-skins | |
| # Changes to be committed: | |
| # | |
| # modified: app/controllers/admin/cms_controller.rb | |
| # new file: app/controllers/api/image_controller.rb | |
| # modified: app/controllers/api/mobile_controller.rb | |
| # modified: app/controllers/front_page_controller.rb | |
| # deleted: app/controllers/scores_controller.rb | |
| # new file: app/controllers/sections/stats_controller.rb | |
| # deleted: app/controllers/standings_controller.rb | |
| # modified: app/controllers/sweepstakes_controller.rb | |
| # modified: app/models/engaged_reader.rb | |
| # modified: app/models/geodb.rb | |
| # modified: app/models/reward/leaderboard_reward.rb | |
| # modified: app/models/tag.rb | |
| # modified: app/models/user_ext/leveling.rb | |
| # modified: app/views/admin/team_newsletters/_email_template.erb | |
| # modified: app/views/articles/related_content/_a_simple.html.erb | |
| # modified: app/views/common/ads/_mobile_top.html.erb | |
| # modified: app/views/common/modules/_lead_nfl1000.html.erb | |
| # modified: app/views/common/modules/_social_module.html.erb | |
| # modified: app/views/common/modules/_uber_module.html.erb | |
| # modified: app/views/common/modules/_uber_stream.html.erb | |
| # new file: app/views/common/modules/stats/_scores.html.erb | |
| # renamed: app/views/common/modules/_standings.html.erb -> app/views/common/modules/stats/_standings.html.erb | |
| # modified: app/views/front_page/index.html.erb | |
| # modified: app/views/front_page/team_stream_test.html.erb | |
| # modified: app/views/layouts/bleacherreport/header/_mobile.html.erb | |
| # modified: app/views/layouts/cobrands/la_times/_footer.html.erb | |
| # modified: app/views/layouts/cobrands/la_times/_for_foot.html.erb | |
| # modified: app/views/layouts/cobrands/la_times/_for_head.html.erb | |
| # modified: app/views/layouts/cobrands/la_times/_header.html.erb | |
| # modified: app/views/layouts/mobile.html.erb | |
| # modified: app/views/sections/cmservice.html.erb | |
| # new file: app/views/sections/stats/mobile_scores.html.erb | |
| # renamed: app/views/standings/mobile_show.html.erb -> app/views/sections/stats/mobile_standings.html.erb | |
| # new file: app/views/sections/stats/scores.html.erb | |
| # renamed: app/views/standings/show.html.erb -> app/views/sections/stats/standings.html.erb | |
| # modified: app/views/sections/stream/_stream_item.html.erb | |
| # modified: app/views/sections/teams/show.html.erb | |
| # modified: app/views/sections/teams/show_team_redesign.html.erb | |
| # new file: bin/fix/fix_wrong_tag.rb | |
| # modified: bin/import/last_week | |
| # new file: bin/test_push_notification.rb | |
| # modified: config/assets.yml | |
| # modified: config/cms/schema.yml | |
| # modified: config/cms/templates.yml | |
| # modified: config/initializers/apns.rb | |
| # modified: config/routes.rb | |
| # modified: config/schedule.rb | |
| # modified: config/timed_config.yml | |
| # new file: db/migrate/20120222014720_update_tsn_id_type.rb | |
| # modified: lib/ad_container.rb | |
| # modified: lib/deprecated_paperclip_url.rb | |
| # modified: lib/push_notification_sender.rb | |
| # modified: lib/tasks/br.rake | |
| # modified: lib/video_support.rb | |
| # new file: public/images/redesign/modules/uber-module/ts_macaulayculkin.png | |
| # modified: public/javascripts/redesign/admin/cms.js | |
| # modified: public/javascripts/redesign/admin/front-page/front-page.js | |
| # modified: public/javascripts/redesign/analytics/recon.js | |
| # new file: public/javascripts/redesign/analytics/yt.js | |
| # modified: public/javascripts/redesign/front-page/team_stream.js | |
| # modified: public/javascripts/redesign/jquery/cycle.multipleelements.js | |
| # renamed: public/pkg/javascripts/9a6e3af3_redesign_newsletter_static.js -> public/pkg/javascripts/06af815d_redesign_newsletter_static.js | |
| # renamed: public/pkg/javascripts/ae933ea4_redesign_admin_front_page.js -> public/pkg/javascripts/4c43361b_redesign_admin_front_page.js | |
| # renamed: public/pkg/javascripts/32703939_redesign_common.js -> public/pkg/javascripts/79be5273_redesign_common.js | |
| # deleted: public/pkg/javascripts/839789ac_cmservice.js | |
| # new file: public/pkg/javascripts/b9ace7ca_redesign_front_page.js | |
| # new file: public/pkg/javascripts/cf3beef4_cmservice.js | |
| # deleted: public/pkg/javascripts/d543c821_redesign_front_page.js | |
| # new file: public/pkg/stylesheets/01e47f67_redesign_cobranding_la_times.css | |
| # new file: public/pkg/stylesheets/1498006b_redesign_mybr.css | |
| # renamed: public/pkg/stylesheets/d8f69b83_redesign_common.css -> public/pkg/stylesheets/1a2686b2_redesign_common.css | |
| # deleted: public/pkg/stylesheets/3735aa20_redesign_cobranding_la_times.css | |
| # renamed: public/pkg/stylesheets/d136e548_redesign_mobile_embedded.css -> public/pkg/stylesheets/5a7d9dd5_redesign_mobile_embedded.css | |
| # renamed: public/pkg/stylesheets/04c842d0_redesign_mobile.css -> public/pkg/stylesheets/5f628f7f_redesign_mobile.css | |
| # deleted: public/pkg/stylesheets/8a94cce6_redesign_mybr.css | |
| # renamed: public/pkg/stylesheets/5318fdc2_redesign_tablet.css -> public/pkg/stylesheets/b8a17dd1_redesign_tablet.css | |
| # renamed: public/pkg/stylesheets/a4866fb6_redesign_newsletter_static.css -> public/pkg/stylesheets/c3b8b63d_redesign_newsletter_static.css | |
| # renamed: public/pkg/stylesheets/2b0ee831_redesign_cobranding.css -> public/pkg/stylesheets/e30b36bc_redesign_cobranding.css | |
| # modified: public/stylesheets/redesign/cobranding/la-times.css | |
| # modified: public/stylesheets/redesign/common/modules.css | |
| # modified: public/stylesheets/redesign/mybr/mybr.css | |
| # modified: vendor/plugins/bronto/config/bronto.yml | |
| # modified: vendor/plugins/bronto/lib/bronto.rb | |
| # modified: vendor/plugins/justintv-apns/lib/apns/core.rb | |
| # modified: vendor/plugins/paperclip/lib/paperclip/attachment.rb | |
| # | |
| # Unmerged paths: | |
| # (use "git add/rm <file>..." as appropriate to mark resolution) | |
| # | |
| # both modified: public/javascripts/redesign/common/common.js | |
| # | |
| walle:breport (rc-7492-allow-transparent-skins|MERGING) $ git diff | |
| diff --cc public/javascripts/redesign/common/common.js | |
| index ffd0c2d,c6bd093..0000000 | |
| --- a/public/javascripts/redesign/common/common.js | |
| +++ b/public/javascripts/redesign/common/common.js | |
| @@@ -96,4 -91,4 +96,8 @@@ $(document).ready(function() | |
| if (Columnist == "true") { | |
| $('#writer-type').val('true'); | |
| } | |
| -}); | |
| ++<<<<<<< HEAD | |
| +}); | |
| ++======= | |
| ++}); | |
| ++>>>>>>> br/rc | |
| walle:breport (rc-7492-allow-transparent-skins|MERGING) $ subl -a . | |
| walle:breport (rc-7492-allow-transparent-skins|MERGING) $ subl -a public/javascripts/redesign/common/common.js | |
| walle:breport (rc-7492-allow-transparent-skins|MERGING) $ gi tst | |
| -bash: gi: command not found | |
| walle:breport (rc-7492-allow-transparent-skins|MERGING) $ git st | |
| # On branch rc-7492-allow-transparent-skins | |
| # Changes to be committed: | |
| # | |
| # modified: app/controllers/admin/cms_controller.rb | |
| # new file: app/controllers/api/image_controller.rb | |
| # modified: app/controllers/api/mobile_controller.rb | |
| # modified: app/controllers/front_page_controller.rb | |
| # deleted: app/controllers/scores_controller.rb | |
| # new file: app/controllers/sections/stats_controller.rb | |
| # deleted: app/controllers/standings_controller.rb | |
| # modified: app/controllers/sweepstakes_controller.rb | |
| # modified: app/models/engaged_reader.rb | |
| # modified: app/models/geodb.rb | |
| # modified: app/models/reward/leaderboard_reward.rb | |
| # modified: app/models/tag.rb | |
| # modified: app/models/user_ext/leveling.rb | |
| # modified: app/views/admin/team_newsletters/_email_template.erb | |
| # modified: app/views/articles/related_content/_a_simple.html.erb | |
| # modified: app/views/common/ads/_mobile_top.html.erb | |
| # modified: app/views/common/modules/_lead_nfl1000.html.erb | |
| # modified: app/views/common/modules/_social_module.html.erb | |
| # modified: app/views/common/modules/_uber_module.html.erb | |
| # modified: app/views/common/modules/_uber_stream.html.erb | |
| # new file: app/views/common/modules/stats/_scores.html.erb | |
| # renamed: app/views/common/modules/_standings.html.erb -> app/views/common/modules/stats/_standings.html.erb | |
| # modified: app/views/front_page/index.html.erb | |
| # modified: app/views/front_page/team_stream_test.html.erb | |
| # modified: app/views/layouts/bleacherreport/header/_mobile.html.erb | |
| # modified: app/views/layouts/cobrands/la_times/_footer.html.erb | |
| # modified: app/views/layouts/cobrands/la_times/_for_foot.html.erb | |
| # modified: app/views/layouts/cobrands/la_times/_for_head.html.erb | |
| # modified: app/views/layouts/cobrands/la_times/_header.html.erb | |
| # modified: app/views/layouts/mobile.html.erb | |
| # modified: app/views/sections/cmservice.html.erb | |
| # new file: app/views/sections/stats/mobile_scores.html.erb | |
| # renamed: app/views/standings/mobile_show.html.erb -> app/views/sections/stats/mobile_standings.html.erb | |
| # new file: app/views/sections/stats/scores.html.erb | |
| # renamed: app/views/standings/show.html.erb -> app/views/sections/stats/standings.html.erb | |
| # modified: app/views/sections/stream/_stream_item.html.erb | |
| # modified: app/views/sections/teams/show.html.erb | |
| # modified: app/views/sections/teams/show_team_redesign.html.erb | |
| # new file: bin/fix/fix_wrong_tag.rb | |
| # modified: bin/import/last_week | |
| # new file: bin/test_push_notification.rb | |
| # modified: config/assets.yml | |
| # modified: config/cms/schema.yml | |
| # modified: config/cms/templates.yml | |
| # modified: config/initializers/apns.rb | |
| # modified: config/routes.rb | |
| # modified: config/schedule.rb | |
| # modified: config/timed_config.yml | |
| # new file: db/migrate/20120222014720_update_tsn_id_type.rb | |
| # modified: lib/ad_container.rb | |
| # modified: lib/deprecated_paperclip_url.rb | |
| # modified: lib/push_notification_sender.rb | |
| # modified: lib/tasks/br.rake | |
| # modified: lib/video_support.rb | |
| # new file: public/images/redesign/modules/uber-module/ts_macaulayculkin.png | |
| # modified: public/javascripts/redesign/admin/cms.js | |
| # modified: public/javascripts/redesign/admin/front-page/front-page.js | |
| # modified: public/javascripts/redesign/analytics/recon.js | |
| # new file: public/javascripts/redesign/analytics/yt.js | |
| # modified: public/javascripts/redesign/front-page/team_stream.js | |
| # modified: public/javascripts/redesign/jquery/cycle.multipleelements.js | |
| # renamed: public/pkg/javascripts/9a6e3af3_redesign_newsletter_static.js -> public/pkg/javascripts/06af815d_redesign_newsletter_static.js | |
| # renamed: public/pkg/javascripts/ae933ea4_redesign_admin_front_page.js -> public/pkg/javascripts/4c43361b_redesign_admin_front_page.js | |
| # renamed: public/pkg/javascripts/32703939_redesign_common.js -> public/pkg/javascripts/79be5273_redesign_common.js | |
| # deleted: public/pkg/javascripts/839789ac_cmservice.js | |
| # new file: public/pkg/javascripts/b9ace7ca_redesign_front_page.js | |
| # new file: public/pkg/javascripts/cf3beef4_cmservice.js | |
| # deleted: public/pkg/javascripts/d543c821_redesign_front_page.js | |
| # new file: public/pkg/stylesheets/01e47f67_redesign_cobranding_la_times.css | |
| # new file: public/pkg/stylesheets/1498006b_redesign_mybr.css | |
| # renamed: public/pkg/stylesheets/d8f69b83_redesign_common.css -> public/pkg/stylesheets/1a2686b2_redesign_common.css | |
| # deleted: public/pkg/stylesheets/3735aa20_redesign_cobranding_la_times.css | |
| # renamed: public/pkg/stylesheets/d136e548_redesign_mobile_embedded.css -> public/pkg/stylesheets/5a7d9dd5_redesign_mobile_embedded.css | |
| # renamed: public/pkg/stylesheets/04c842d0_redesign_mobile.css -> public/pkg/stylesheets/5f628f7f_redesign_mobile.css | |
| # deleted: public/pkg/stylesheets/8a94cce6_redesign_mybr.css | |
| # renamed: public/pkg/stylesheets/5318fdc2_redesign_tablet.css -> public/pkg/stylesheets/b8a17dd1_redesign_tablet.css | |
| # renamed: public/pkg/stylesheets/a4866fb6_redesign_newsletter_static.css -> public/pkg/stylesheets/c3b8b63d_redesign_newsletter_static.css | |
| # renamed: public/pkg/stylesheets/2b0ee831_redesign_cobranding.css -> public/pkg/stylesheets/e30b36bc_redesign_cobranding.css | |
| # modified: public/stylesheets/redesign/cobranding/la-times.css | |
| # modified: public/stylesheets/redesign/common/modules.css | |
| # modified: public/stylesheets/redesign/mybr/mybr.css | |
| # modified: vendor/plugins/bronto/config/bronto.yml | |
| # modified: vendor/plugins/bronto/lib/bronto.rb | |
| # modified: vendor/plugins/justintv-apns/lib/apns/core.rb | |
| # modified: vendor/plugins/paperclip/lib/paperclip/attachment.rb | |
| # | |
| # Unmerged paths: | |
| # (use "git add/rm <file>..." as appropriate to mark resolution) | |
| # | |
| # both modified: public/javascripts/redesign/common/common.js | |
| # | |
| walle:breport (rc-7492-allow-transparent-skins|MERGING) $ git diff | |
| diff --cc public/javascripts/redesign/common/common.js | |
| index ffd0c2d,c6bd093..0000000 | |
| --- a/public/javascripts/redesign/common/common.js | |
| +++ b/public/javascripts/redesign/common/common.js | |
| walle:breport (rc-7492-allow-transparent-skins|MERGING) $ git add . | |
| walle:breport (rc-7492-allow-transparent-skins|MERGING) $ git st | |
| g# On branch rc-7492-allow-transparent-skins | |
| # Changes to be committed: | |
| # | |
| # modified: app/controllers/admin/cms_controller.rb | |
| # new file: app/controllers/api/image_controller.rb | |
| # modified: app/controllers/api/mobile_controller.rb | |
| # modified: app/controllers/front_page_controller.rb | |
| # deleted: app/controllers/scores_controller.rb | |
| # new file: app/controllers/sections/stats_controller.rb | |
| # deleted: app/controllers/standings_controller.rb | |
| # modified: app/controllers/sweepstakes_controller.rb | |
| # modified: app/models/engaged_reader.rb | |
| # modified: app/models/geodb.rb | |
| # modified: app/models/reward/leaderboard_reward.rb | |
| # modified: app/models/tag.rb | |
| # modified: app/models/user_ext/leveling.rb | |
| # modified: app/views/admin/team_newsletters/_email_template.erb | |
| # modified: app/views/articles/related_content/_a_simple.html.erb | |
| # modified: app/views/common/ads/_mobile_top.html.erb | |
| # modified: app/views/common/modules/_lead_nfl1000.html.erb | |
| # modified: app/views/common/modules/_social_module.html.erb | |
| # modified: app/views/common/modules/_uber_module.html.erb | |
| # modified: app/views/common/modules/_uber_stream.html.erb | |
| # new file: app/views/common/modules/stats/_scores.html.erb | |
| # renamed: app/views/common/modules/_standings.html.erb -> app/views/common/modules/stats/_standings.html.erb | |
| # modified: app/views/front_page/index.html.erb | |
| # modified: app/views/front_page/team_stream_test.html.erb | |
| # modified: app/views/layouts/bleacherreport/header/_mobile.html.erb | |
| # modified: app/views/layouts/cobrands/la_times/_footer.html.erb | |
| # modified: app/views/layouts/cobrands/la_times/_for_foot.html.erb | |
| # modified: app/views/layouts/cobrands/la_times/_for_head.html.erb | |
| # modified: app/views/layouts/cobrands/la_times/_header.html.erb | |
| # modified: app/views/layouts/mobile.html.erb | |
| # modified: app/views/sections/cmservice.html.erb | |
| # new file: app/views/sections/stats/mobile_scores.html.erb | |
| # renamed: app/views/standings/mobile_show.html.erb -> app/views/sections/stats/mobile_standings.html.erb | |
| # new file: app/views/sections/stats/scores.html.erb | |
| # renamed: app/views/standings/show.html.erb -> app/views/sections/stats/standings.html.erb | |
| # modified: app/views/sections/stream/_stream_item.html.erb | |
| # modified: app/views/sections/teams/show.html.erb | |
| # modified: app/views/sections/teams/show_team_redesign.html.erb | |
| # new file: bin/fix/fix_wrong_tag.rb | |
| # modified: bin/import/last_week | |
| # new file: bin/test_push_notification.rb | |
| # modified: config/assets.yml | |
| # modified: config/cms/schema.yml | |
| # modified: config/cms/templates.yml | |
| # modified: config/initializers/apns.rb | |
| # modified: config/routes.rb | |
| # modified: config/schedule.rb | |
| # modified: config/timed_config.yml | |
| # new file: db/migrate/20120222014720_update_tsn_id_type.rb | |
| # modified: lib/ad_container.rb | |
| # modified: lib/deprecated_paperclip_url.rb | |
| # modified: lib/push_notification_sender.rb | |
| # modified: lib/tasks/br.rake | |
| # modified: lib/video_support.rb | |
| # new file: public/images/redesign/modules/uber-module/ts_macaulayculkin.png | |
| # modified: public/javascripts/redesign/admin/cms.js | |
| # modified: public/javascripts/redesign/admin/front-page/front-page.js | |
| # modified: public/javascripts/redesign/analytics/recon.js | |
| # new file: public/javascripts/redesign/analytics/yt.js | |
| # modified: public/javascripts/redesign/front-page/team_stream.js | |
| # modified: public/javascripts/redesign/jquery/cycle.multipleelements.js | |
| # renamed: public/pkg/javascripts/9a6e3af3_redesign_newsletter_static.js -> public/pkg/javascripts/06af815d_redesign_newsletter_static.js | |
| # renamed: public/pkg/javascripts/ae933ea4_redesign_admin_front_page.js -> public/pkg/javascripts/4c43361b_redesign_admin_front_page.js | |
| # renamed: public/pkg/javascripts/32703939_redesign_common.js -> public/pkg/javascripts/79be5273_redesign_common.js | |
| # deleted: public/pkg/javascripts/839789ac_cmservice.js | |
| # new file: public/pkg/javascripts/b9ace7ca_redesign_front_page.js | |
| # new file: public/pkg/javascripts/cf3beef4_cmservice.js | |
| # deleted: public/pkg/javascripts/d543c821_redesign_front_page.js | |
| # new file: public/pkg/stylesheets/01e47f67_redesign_cobranding_la_times.css | |
| # new file: public/pkg/stylesheets/1498006b_redesign_mybr.css | |
| # renamed: public/pkg/stylesheets/d8f69b83_redesign_common.css -> public/pkg/stylesheets/1a2686b2_redesign_common.css | |
| # deleted: public/pkg/stylesheets/3735aa20_redesign_cobranding_la_times.css | |
| # renamed: public/pkg/stylesheets/d136e548_redesign_mobile_embedded.css -> public/pkg/stylesheets/5a7d9dd5_redesign_mobile_embedded.css | |
| # renamed: public/pkg/stylesheets/04c842d0_redesign_mobile.css -> public/pkg/stylesheets/5f628f7f_redesign_mobile.css | |
| # deleted: public/pkg/stylesheets/8a94cce6_redesign_mybr.css | |
| # renamed: public/pkg/stylesheets/5318fdc2_redesign_tablet.css -> public/pkg/stylesheets/b8a17dd1_redesign_tablet.css | |
| # renamed: public/pkg/stylesheets/a4866fb6_redesign_newsletter_static.css -> public/pkg/stylesheets/c3b8b63d_redesign_newsletter_static.css | |
| # renamed: public/pkg/stylesheets/2b0ee831_redesign_cobranding.css -> public/pkg/stylesheets/e30b36bc_redesign_cobranding.css | |
| # modified: public/stylesheets/redesign/cobranding/la-times.css | |
| # modified: public/stylesheets/redesign/common/modules.css | |
| # modified: public/stylesheets/redesign/mybr/mybr.css | |
| # modified: vendor/plugins/bronto/config/bronto.yml | |
| # modified: vendor/plugins/bronto/lib/bronto.rb | |
| # modified: vendor/plugins/justintv-apns/lib/apns/core.rb | |
| # modified: vendor/plugins/paperclip/lib/paperclip/attachment.rb | |
| # | |
| walle:breport (rc-7492-allow-transparent-skins|MERGING) $ git ci | |
| [rc-7492-allow-transparent-skins 6ddb2fa] Merge remote branch 'br/rc' into rc-7492-allow-transparent-skins | |
| walle:breport (rc-7492-allow-transparent-skins) $ gitc push | |
| Retrieving branch information from gitcycle. | |
| Retrieving repo information from gitcycle. | |
| Adding remote repo 'br/breport'. | |
| Fetching remote 'br'. | |
| Pushing branch 'origin/rc-7492-allow-transparent-skins'. | |
| walle:breport (rc-7492-allow-transparent-skins) $ git push chrispederick rc-7492-allow-transparent-skins | |
| Counting objects: 459, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (154/154), done. | |
| Writing objects: 100% (328/328), 137.34 KiB, done. | |
| Total 328 (delta 273), reused 214 (delta 173) | |
| To git@github.com:chrispederick/breport.git | |
| 3d9ce7d..6ddb2fa rc-7492-allow-transparent-skins -> rc-7492-allow-transparent-skins | |
| walle:breport (rc-7492-allow-transparent-skins) $ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment