gistfile1.txt

Colms-MacBook-Air:breakout colmtuite$ git status
# On branch colm-complete-framework
# Changes to be committed:
#
#	new file:   app/assets/images/portfolio-manager/connected-overview/connectors.png
#	new file:   app/assets/images/portfolio-manager/connected-overview/dashboard.png
#	new file:   app/assets/images/portfolio-manager/connected-overview/milestones.png
#	new file:   app/assets/images/portfolio-manager/connected-overview/most-active-spaces.png
#	new file:   app/assets/images/portfolio-manager/connected-overview/recent-added-spaces.png
#	modified:   app/assets/javascripts/code.js
#	modified:   app/assets/javascripts/portfolio-onboard.coffee
#	modified:   app/assets/javascripts/view/spaces/documents_tool/components/browsers_context_menu.js.jsx
#	modified:   app/assets/javascripts/view/spaces/documents_tool/components/create_new_folder_button.js.jsx
#	modified:   app/assets/javascripts/view/spaces/documents_tool/components/file_list.js.jsx
#	modified:   app/assets/javascripts/view/spaces/tickets/cardwall.js
#	modified:   app/assets/javascripts/view/user/account.coffee
#	modified:   app/assets/javascripts/view/user/account/components/plan_button.js.jsx
#	new file:   app/assets/javascripts/view/user/account/components/plan_item.js.jsx
#	modified:   app/assets/javascripts/view/user/account/components/plans_list.js.jsx
#	modified:   app/assets/javascripts/view/user/account/components/pricing_link.js.jsx
#	modified:   app/assets/javascripts/widgets/cloud_file_input.js
#	deleted:    app/assets/stylesheets/sections/connect/connect.scss
#	modified:   app/assets/stylesheets/v4/theme/line-height.scss
#	modified:   app/assets/stylesheets/v4/theme/padding.scss
#	modified:   app/controllers/application_controller.rb
#	modified:   app/controllers/base_spaces_controller.rb
#	modified:   app/controllers/portfolio_manager/base_controller.rb
#	modified:   app/controllers/spaces/tickets_controller.rb
#	modified:   app/controllers/spaces_controller.rb
#	renamed:    app/controllers/styleguides_controller.rb -> app/controllers/styleguide_controller.rb
#	modified:   app/controllers/user/feature_tests_controller.rb
#	modified:   app/controllers/user_controller.rb
#	deleted:    app/helpers/portfolio_management_helper.rb
#	modified:   app/helpers/portfolio_manager/base_helper.rb
#	modified:   app/helpers/spaces/tickets_helper.rb
#	modified:   app/helpers/user/feature_tests_helper.rb
#	modified:   app/helpers/user_helper.rb
#	modified:   app/models/event.rb
#	modified:   app/models/ticket.rb
#	modified:   app/models/user.rb
#	modified:   app/presenters/new_plan_presenter.rb
#	modified:   app/presenters/portfolio_manager/spaces_report.rb
#	modified:   app/processors/application_processor.rb
#	modified:   app/views/kaminari/_page.html.erb
#	modified:   app/views/layouts/styleguide.html.erb
#	modified:   app/views/portfolio_manager/base/_connected_overview.html.erb
#	modified:   app/views/portfolio_manager/base/connected_overview/_cta.html.erb
#	new file:   app/views/portfolio_manager/base/connected_overview/_first_visit.html.erb
#	modified:   app/views/portfolio_manager/base/connected_overview/_most_active_spaces.html.erb
#	modified:   app/views/portfolio_manager/base/connected_overview/_recent_added_spaces.html.erb
#	modified:   app/views/portfolio_manager/base/overview_boxes/_workspaces.html.erb
#	modified:   app/views/spaces/changeset_comments/create.js.erb
#	modified:   app/views/spaces/comments/_comment.html.erb
#	modified:   app/views/spaces/comments/_destroy_changeset_comment.js.erb
#	modified:   app/views/spaces/comments/_edit_ticket_comment.html.erb
#	modified:   app/views/spaces/comments/create.js.erb
#	modified:   app/views/spaces/comments/show.js.erb
#	modified:   app/views/spaces/documents/index.html.erb
#	renamed:    app/views/styleguides/_new_header.html.erb -> app/views/styleguide/_new_header.html.erb
#	new file:   app/views/styleguide/classes/custom/_background_color.html.erb
#	new file:   app/views/styleguide/classes/custom/_border.html.erb
#	new file:   app/views/styleguide/classes/custom/_border_color.html.erb
#	new file:   app/views/styleguide/classes/custom/_border_radius.html.erb
#	new file:   app/views/styleguide/classes/custom/_box_shadow.html.erb
#	new file:   app/views/styleguide/classes/custom/_color.html.erb
#	new file:   app/views/styleguide/classes/custom/_font_family.html.erb
#	new file:   app/views/styleguide/classes/custom/_font_size.html.erb
#	new file:   app/views/styleguide/classes/custom/_gradient.html.erb
#	new file:   app/views/styleguide/classes/custom/_letter_spacing.html.erb
#	new file:   app/views/styleguide/classes/custom/_line_height.html.erb
#	new file:   app/views/styleguide/classes/custom/_margin.html.erb
#	new file:   app/views/styleguide/classes/custom/_padding.html.erb
#	new file:   app/views/styleguide/classes/predefined/_appearence.html.erb
#	new file:   app/views/styleguide/classes/predefined/_backface_visibility.html.erb
#	new file:   app/views/styleguide/classes/predefined/_border_style.html.erb
#	new file:   app/views/styleguide/classes/predefined/_border_width.html.erb
#	new file:   app/views/styleguide/classes/predefined/_box_sizing.html.erb
#	new file:   app/views/styleguide/classes/predefined/_clear.html.erb
#	new file:   app/views/styleguide/classes/predefined/_cursor.html.erb
#	new file:   app/views/styleguide/classes/predefined/_direction.html.erb
#	new file:   app/views/styleguide/classes/predefined/_display.html.erb
#	new file:   app/views/styleguide/classes/predefined/_float.html.erb
#	new file:   app/views/styleguide/classes/predefined/_font_style.html.erb
#	new file:   app/views/styleguide/classes/predefined/_font_weight.html.erb
#	new file:   app/views/styleguide/classes/predefined/_height.html.erb
#	new file:   app/views/styleguide/classes/predefined/_list_style.html.erb
#	new file:   app/views/styleguide/classes/predefined/_opacity.html.erb
#	new file:   app/views/styleguide/classes/predefined/_outline_style.html.erb
#	new file:   app/views/styleguide/classes/predefined/_outline_width.html.erb
#	new file:   app/views/styleguide/classes/predefined/_overflow.html.erb
#	new file:   app/views/styleguide/classes/predefined/_position.html.erb
#	new file:   app/views/styleguide/classes/predefined/_resize.html.erb
#	new file:   app/views/styleguide/classes/predefined/_tap_highlight.html.erb
#	new file:   app/views/styleguide/classes/predefined/_text_align.html.erb
#	new file:   app/views/styleguide/classes/predefined/_text_decoration.html.erb
#	new file:   app/views/styleguide/classes/predefined/_text_overflow.html.erb
#	new file:   app/views/styleguide/classes/predefined/_text_rendering.html.erb
#	new file:   app/views/styleguide/classes/predefined/_text_transform.html.erb
#	new file:   app/views/styleguide/classes/predefined/_transform_style.html.erb
#	new file:   app/views/styleguide/classes/predefined/_transition_property.html.erb
#	new file:   app/views/styleguide/classes/predefined/_user_select.html.erb
#	new file:   app/views/styleguide/classes/predefined/_vertical_align.html.erb
#	new file:   app/views/styleguide/classes/predefined/_visibility.html.erb
#	new file:   app/views/styleguide/classes/predefined/_white_space.html.erb
#	new file:   app/views/styleguide/classes/predefined/_width.html.erb
#	new file:   app/views/styleguide/classes/predefined/_word_break.html.erb
#	new file:   app/views/styleguide/classes/predefined/_word_wrap.html.erb
#	renamed:    app/views/styleguides/components.html.erb -> app/views/styleguide/components.html.erb
#	renamed:    app/views/styleguides/components/_alert.html.erb -> app/views/styleguide/components/_alert.html.erb
#	renamed:    app/views/styleguides/components/_arrow.html.erb -> app/views/styleguide/components/_arrow.html.erb
#	renamed:    app/views/styleguides/components/_breadcrumb.html.erb -> app/views/styleguide/components/_breadcrumb.html.erb
#	renamed:    app/views/styleguides/components/_button.html.erb -> app/views/styleguide/components/_button.html.erb
#	renamed:    app/views/styleguides/components/_color_scheme.html.erb -> app/views/styleguide/components/_color_scheme.html.erb
#	renamed:    app/views/styleguides/components/_context_menu.html.erb -> app/views/styleguide/components/_context_menu.html.erb
#	renamed:    app/views/styleguides/components/_dropdown.html.erb -> app/views/styleguide/components/_dropdown.html.erb
#	renamed:    app/views/styleguides/components/_form.html.erb -> app/views/styleguide/components/_form.html.erb
#	renamed:    app/views/styleguides/components/_grid.html.erb -> app/views/styleguide/components/_grid.html.erb
#	renamed:    app/views/styleguides/components/_icon.html.erb -> app/views/styleguide/components/_icon.html.erb
#	renamed:    app/views/styleguides/components/_label.html.erb -> app/views/styleguide/components/_label.html.erb
#	renamed:    app/views/styleguides/components/_link.html.erb -> app/views/styleguide/components/_link.html.erb
#	renamed:    app/views/styleguides/components/_modal.html.erb -> app/views/styleguide/components/_modal.html.erb
#	renamed:    app/views/styleguides/components/_scrollbar.html.erb -> app/views/styleguide/components/_scrollbar.html.erb
#	renamed:    app/views/styleguides/components/_table.html.erb -> app/views/styleguide/components/_table.html.erb
#	renamed:    app/views/styleguides/components/_typography.html.erb -> app/views/styleguide/components/_typography.html.erb
#	new file:   app/views/styleguide/custom_classes.html.erb
#	new file:   app/views/styleguide/demo/_sidebar_account.html.erb
#	renamed:    app/views/styleguides/demo/_sidebar_files.html.erb -> app/views/styleguide/demo/_sidebar_files.html.erb
#	renamed:    app/views/styleguides/demo/_sidebar_messages.html.erb -> app/views/styleguide/demo/_sidebar_messages.html.erb
#	renamed:    app/views/styleguides/demoabout.html.erb -> app/views/styleguide/demoabout.html.erb
#	renamed:    app/views/styleguides/demoaccount.html.erb -> app/views/styleguide/demoaccount.html.erb
#	renamed:    app/views/styleguides/democontact.html.erb -> app/views/styleguide/democontact.html.erb
#	renamed:    app/views/styleguides/demofiles.html.erb -> app/views/styleguide/demofiles.html.erb
#	renamed:    app/views/styleguides/demomessages.html.erb -> app/views/styleguide/demomessages.html.erb
#	renamed:    app/views/styleguides/demopassword.html.erb -> app/views/styleguide/demopassword.html.erb
#	renamed:    app/views/styleguides/demoprofile.html.erb -> app/views/styleguide/demoprofile.html.erb
#	renamed:    app/views/styleguides/overview.html.erb -> app/views/styleguide/overview.html.erb
#	new file:   app/views/styleguide/predefined_classes.html.erb
#	renamed:    app/views/styleguides/utilities.html.erb -> app/views/styleguide/utilities.html.erb
#	deleted:    app/views/styleguides/classes.html.erb
#	deleted:    app/views/styleguides/demo/_sidebar_account.html.erb
#	modified:   app/views/user/new_profile/_profile.html.erb
#	modified:   app/views/user/new_profile/account/_plan_details.html.erb
#	modified:   app/views/user/profile/_box_share_info.html.erb
#	modified:   app/views/user/profile/_login_info.html.erb
#	modified:   app/views/widgets/_breakout_js_header.html.erb
#	modified:   config/initializers/000_load_config.rb
#	modified:   config/locales/js/files_tool_manager/en.yml
#	modified:   config/locales/shared/tabs/en.yml
#	modified:   config/locales/views/portfolio_manager/base/en.yml
#	modified:   config/locales/views/spaces/documents/en.yml
#	modified:   config/locales/views/user/en.yml
#	modified:   config/locales/views/user/new_profile/account/en.yml
#	modified:   config/routes.rb
#	modified:   config/settings.yml
#	modified:   config/settings_features.yml
#	modified:   lib/breakout.rb
#	modified:   lib/breakout/captcha.rb
#	modified:   lib/breakout/event_manager.rb
#	modified:   lib/breakout/mq.rb
#	modified:   lib/breakout/mq/connection.rb
#	modified:   lib/breakout/space_setup.rb
#	modified:   lib/breakout/utils.rb
#	new file:   lib/engines/breakout_elasticsearch/app/processors/breakout_elasticsearch/portfolio_files_index_processor.rb
#	new file:   lib/engines/breakout_elasticsearch/app/processors/portfolio_events_processor.rb
#	modified:   lib/engines/breakout_elasticsearch/lib/breakout_elasticsearch/document_mappers/event.rb
#	new file:   lib/engines/breakout_elasticsearch/lib/breakout_elasticsearch/document_mappers/file.rb
#	modified:   lib/engines/breakout_elasticsearch/lib/breakout_elasticsearch/documents/event.rb
#	new file:   lib/engines/breakout_elasticsearch/lib/breakout_elasticsearch/documents/file.rb
#	modified:   lib/engines/breakout_elasticsearch/lib/breakout_elasticsearch/engine.rb
#	new file:   lib/engines/breakout_elasticsearch/lib/breakout_elasticsearch/query_builder.rb
#	new file:   lib/engines/breakout_elasticsearch/lib/tasks/jobs.rake
#	new file:   lib/engines/breakout_elasticsearch/spec/lib/breakout_elasticsearch/document_mappers/event.rb
#	new file:   lib/engines/breakout_elasticsearch/spec/lib/breakout_elasticsearch/documents/event.rb
#	new file:   lib/engines/breakout_elasticsearch/spec/processors/portfolio_events_processor_spec.rb
#	modified:   lib/engines/dropbox_connector/app/assets/javascripts/view/spaces/dropbox_tool/components/file_list.js.jsx
#	modified:   lib/next_file_manager/cloud.rb
#	modified:   lib/tasks/app_custom.rake
#	modified:   public/CF10XX.html
#	modified:   public/CF5XX.html
#	modified:   public/CFAO.html
#	modified:   spec/controllers/base_spaces_controller_spec.rb
#	modified:   spec/controllers/spaces_controller_spec.rb
#	modified:   spec/controllers/user_controller_purchase_spec.rb
#	modified:   spec/controllers/user_controller_spec.rb
#	modified:   spec/factories.rb
#	deleted:    spec/helpers/portfolio_management_helper_spec.rb
#	modified:   spec/helpers/spaces/tickets_helper_spec.rb
#	modified:   spec/lib/breakout/captcha_spec.rb
#	modified:   spec/lib/next_file_manager/cloud_spec.rb
#	modified:   spec/models/event_spec.rb
#	modified:   spec/models/user_spec.rb
#	modified:   spec/presenters/new_plan_presenter_spec.rb
#	modified:   spec/views/spaces/comments/_comment.html.erb_spec.rb
#	modified:   spec/views/spaces/tickets/_ticket_comment.html.erb_spec.rb
#	modified:   spec/views/user/_edit_about_me.html.erb_spec.rb
#	modified:   spec/views/user/_edit_account_information.html.erb_spec.rb
#	modified:   spec/views/user/_edit_contact_information.html.erb_spec.rb
#	modified:   spec/views/user/new_profile/account/_plan_details.html.erb_spec.rb
#	modified:   spec/views/user/ssh_keys/_ssh_key.html.erb_spec.rb
#
# Unmerged paths:
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#	both modified:      app/assets/stylesheets/v4/misc/shame.scss
#	both modified:      app/views/user/_edit_about_me.html.erb
#	both modified:      app/views/user/_edit_account_information.html.erb
#	both modified:      app/views/user/_edit_account_settings.html.erb
#	both modified:      app/views/user/_edit_contact_information.html.erb
#	both modified:      app/views/user/_edit_msa.html.erb
#	both modified:      app/views/user/_email_notification.html.erb
#	both modified:      app/views/user/_feature_tests.html.erb
#	both modified:      app/views/user/_manage_clients.html.erb
#	both modified:      app/views/user/profile/_password.html.erb
#	both modified:      app/views/user/ssh_keys/_ssh_form.html.erb
#	both modified:      app/views/user/ssh_keys/_ssh_key.html.erb