gistfile1.txt

breport (rc-8194-facebook-remove-old) $ git merge rc-8274-8194-facebook-remove-old
Removing public/javascripts/common/facebook/sign_up_basic.js
Removing public/javascripts/common/facebook/sign_up.js
Removing public/javascripts/common/facebook/sidebar.js
Removing public/javascripts/common/facebook/publish.js
Removing public/javascripts/common/facebook/connect.js
Removing public/javascripts/common/facebook/comments.js
Removing public/javascripts/common/facebook/application.js
Auto-merging config/assets.yml
Auto-merging app/models/tag/notifications.rb
Merge made by the 'recursive' strategy.
 app/controllers/accounts_controller.rb             |   16 +-
 app/controllers/api/user_controller.rb             |    2 +-
 app/controllers/api_controller.rb                  |    2 +-
 app/models/tag/notifications.rb                    |    1 -
 app/models/user.rb                                 |    4 +
 app/models/user/facebook_class.rb                  |   10 +-
 app/views/group/show.html.erb                      |  159 ++++--
 config/assets.yml                                  |    7 +-
 public/javascripts/common/facebook/application.js  |   39 --
 public/javascripts/common/facebook/comments.js     |   44 --
 public/javascripts/common/facebook/connect.js      |  633 --------------------
 public/javascripts/common/facebook/publish.js      |   48 --
 public/javascripts/common/facebook/sidebar.js      |   11 -
 public/javascripts/common/facebook/sign_up.js      |  213 -------
 .../javascripts/common/facebook/sign_up_basic.js   |  118 ----
 public/javascripts/facebook_settings.js            |   14 +-
 .../javascripts/redesign/facebook/application.js   |    8 +-
 public/javascripts/redesign/facebook/comments.js   |    7 +-
 public/javascripts/redesign/groups/mobile.js       |   28 +-
 public/javascripts/redesign/jquery/timeago.js      |  148 +++++
 public/stylesheets/redesign/groups/mobile.css      |   34 +-
 21 files changed, 341 insertions(+), 1205 deletions(-)
 delete mode 100644 public/javascripts/common/facebook/application.js
 delete mode 100644 public/javascripts/common/facebook/comments.js
 delete mode 100644 public/javascripts/common/facebook/connect.js
 delete mode 100644 public/javascripts/common/facebook/publish.js
 delete mode 100644 public/javascripts/common/facebook/sidebar.js
 delete mode 100644 public/javascripts/common/facebook/sign_up.js
 delete mode 100644 public/javascripts/common/facebook/sign_up_basic.js
 create mode 100644 public/javascripts/redesign/jquery/timeago.js
breport (rc-8194-facebook-remove-old) $ st
# On branch rc-8194-facebook-remove-old
# Your branch is ahead of 'br/rc' by 33 commits.
#
nothing to commit (working directory clean)
breport (rc-8194-facebook-remove-old) $ gitc push

Retrieving branch information from gitcycle.

Adding remote repo 'br/breport'.

Fetching remote 'br'.


Merging remote branch 'rc' from 'br/breport'.

Adding remote repo 'arockwell/breport'.

Fetching remote 'arockwell'.


Merging remote branch 'rc-8194-facebook-remove-old' from 'arockwell/breport'.


Pushing branch 'origin/rc-8194-facebook-remove-old'.

breport (rc-8194-facebook-remove-old) $ gitc ready

Retrieving branch information from gitcycle.

Adding remote repo 'br/breport'.

Fetching remote 'br'.


Merging remote branch 'rc' from 'br/breport'.

Adding remote repo 'arockwell/breport'.

Fetching remote 'arockwell'.


Merging remote branch 'rc-8194-facebook-remove-old' from 'arockwell/breport'.


Labeling issue as 'Pending Review'.

Opening issue: https://github.com/br/breport/issues/610