Last login: Thu Feb 16 17:21:09 on ttys005 Ryans-MacBook-Air:CivicIdeas ryan$ rake assethat:minify (in /Users/ryan/Dropbox/Work/CivicIdeas) Minifying CSS/JS... Wrote CSS bundle: public/stylesheets/bundles/application.min.css contains: public/stylesheets/style.css contains: public/stylesheets/jqueryuioverrides.css contains: public/stylesheets/layout.css contains: public/stylesheets/typography.css contains: public/stylesheets/forms.css contains: public/stylesheets/buttons.css contains: public/stylesheets/comments.css contains: public/stylesheets/users.css contains: public/stylesheets/sidebar.css contains: public/stylesheets/companies.css contains: public/stylesheets/discussions.css contains: public/stylesheets/ideas.css contains: public/stylesheets/developers.css contains: public/stylesheets/surveys.css contains: public/stylesheets/featuredbox.css contains: public/stylesheets/sessions.css contains: public/stylesheets/subhome.css MINIFIED: 19.2% (Engine: cssmin) Wrote CSS bundle: public/stylesheets/bundles/plugins.min.css contains: public/stylesheets/jquery-ui-1.8.5.custom.css contains: public/stylesheets/jquery.fancybox-1.3.4.css MINIFIED: 21.8% (Engine: cssmin) Wrote CSS bundle: public/stylesheets/bundles/widget.min.css contains: public/stylesheets/jquery-ui-1.8.5.custom.css contains: public/stylesheets/style.css contains: public/stylesheets/jqueryuioverrides.css contains: public/stylesheets/forms.css contains: public/stylesheets/typography.css contains: public/stylesheets/buttons.css contains: public/stylesheets/widgets.css MINIFIED: 21.7% (Engine: cssmin) Wrote JS bundle: public/javascripts/bundles/application.min.js contains: public/javascripts/toggleQuestions.jquery.js contains: public/javascripts/statusWidget.jquery.js contains: public/javascripts/localeSwitcher.jquery.js contains: public/javascripts/rails.js contains: public/javascripts/application.js contains: public/javascripts/validations.js contains: public/javascripts/mce.js MINIFIED: 39.8% (Engine: jsmin) Wrote JS bundle: public/javascripts/bundles/plugins.min.js contains: public/javascripts/placeholder.jquery.js contains: public/javascripts/jquery.fancybox-1.3.4.js contains: public/javascripts/jquery.tablesorter.min.js contains: public/javascripts/slides.jquery.js contains: public/javascripts/waypoints.min.js contains: public/javascripts/jquery.yafov.js contains: public/javascripts/jquery.infieldlabel.js contains: public/javascripts/sisyphus.min.js MINIFIED: 39.2% (Engine: jsmin) Wrote JS bundle: public/javascripts/bundles/widget.min.js contains: public/javascripts/rails.js contains: public/javascripts/widgets.js MINIFIED: 52.6% (Engine: jsmin) Done. Loaded suite /Users/ryan/.rvm/gems/ruby-1.9.2-p290@global/bin/rake Started Finished in 0.004952 seconds. 0 tests, 0 assertions, 0 failures, 0 errors, 0 skips Test run options: --seed 51828 Ryans-MacBook-Air:CivicIdeas ryan$ git status

On branch feature/expandcommentbox

Changes to be committed:

(use "git reset HEAD ..." to unstage)

new file: public/javascripts/ideas.js

Changes not staged for commit:

(use "git add ..." to update what will be committed)

(use "git checkout -- ..." to discard changes in working directory)

modified: app/controllers/comments_controller.rb

modified: app/views/layouts/_common.html.erb

modified: config/routes.rb

modified: public/javascripts/application.js

modified: public/javascripts/bundles/application.min.js

modified: public/javascripts/ideas.js

Untracked files:

(use "git add ..." to include in what will be committed)

.idea/

Ryans-MacBook-Air:CivicIdeas ryan$ git checkout config/routes.rb Ryans-MacBook-Air:CivicIdeas ryan$ git status

On branch feature/expandcommentbox

Changes to be committed:

(use "git reset HEAD ..." to unstage)

new file: public/javascripts/ideas.js

Changes not staged for commit:

(use "git add ..." to update what will be committed)

(use "git checkout -- ..." to discard changes in working directory)

modified: app/controllers/comments_controller.rb

modified: app/views/layouts/_common.html.erb

modified: public/javascripts/application.js

modified: public/javascripts/bundles/application.min.js

modified: public/javascripts/ideas.js

Untracked files:

(use "git add ..." to include in what will be committed)

.idea/

Ryans-MacBook-Air:CivicIdeas ryan$ git checkout app/controllers/commentscontroller.rb Ryans-MacBook-Air:CivicIdeas ryan$ git checkout app/views/layouts/common.html.erb Ryans-MacBook-Air:CivicIdeas ryan$ git status

On branch feature/expandcommentbox

Changes not staged for commit:

(use "git add ..." to update what will be committed)

(use "git checkout -- ..." to discard changes in working directory)

modified: public/javascripts/application.js

modified: public/javascripts/bundles/application.min.js

Untracked files:

(use "git add ..." to include in what will be committed)

.idea/

no changes added to commit (use "git add" and/or "git commit -a") Ryans-MacBook-Air:CivicIdeas ryan$ vi .gitignore Ryans-MacBook-Air:CivicIdeas ryan$ git status

On branch feature/expandcommentbox

Changes not staged for commit:

(use "git add ..." to update what will be committed)

(use "git checkout -- ..." to discard changes in working directory)

modified: .gitignore

modified: public/javascripts/application.js

modified: public/javascripts/bundles/application.min.js

no changes added to commit (use "git add" and/or "git commit -a") Ryans-MacBook-Air:CivicIdeas ryan$ git add Nothing specified, nothing added. Maybe you wanted to say 'git add .'? Ryans-MacBook-Air:CivicIdeas ryan$ git add . Ryans-MacBook-Air:CivicIdeas ryan$ git commit error: There was a problem with the editor 'vi'. Please supply the message using either -m or -F option. Ryans-MacBook-Air:CivicIdeas ryan$ git commit Aborting commit due to empty commit message. Ryans-MacBook-Air:CivicIdeas ryan$ git commit -m "expand commentbody on hover" [feature/expandcommentbox 32714f5] expand commentbody on hover 3 files changed, 49 insertions(+), 22 deletions(-) Ryans-MacBook-Air:CivicIdeas ryan$ git status

On branch feature/expandcommentbox

nothing to commit (working directory clean) Ryans-MacBook-Air:CivicIdeas ryan$ git branch develop * feature/expandcommentbox master release Ryans-MacBook-Air:CivicIdeas ryan$ git flow feature finish expandcommentbox Switched to branch 'release' Updating b3b296c..32714f5 Fast-forward .gitignore | 1 + public/javascripts/application.js | 64 +++++++++++++++++-------- public/javascripts/bundles/application.min.js | 6 ++- 3 files changed, 49 insertions(+), 22 deletions(-) Deleted branch feature/expandcommentbox (was 32714f5). Summary of actions: - The feature branch 'feature/expandcommentbox' was merged into 'release' - Feature branch 'feature/expandcommentbox' has been removed - You are now on branch 'release' Ryans-MacBook-Air:CivicIdeas ryan$ git branch develop master * release Ryans-MacBook-Air:CivicIdeas ryan$ git checkout develop Switched to branch 'develop' Ryans-MacBook-Air:CivicIdeas ryan$ git push origin develop To git@github.com:Granicus/CivicIdeas.git ! [rejected] develop -> develop (non-fast-forward) error: failed to push some refs to 'git@github.com:Granicus/CivicIdeas.git' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes (e.g. 'git pull') before pushing again. See the 'Note about fast-forwards' section of 'git push --help' for details. Ryans-MacBook-Air:CivicIdeas ryan$ git pull origin develop remote: Counting objects: 130, done. remote: Compressing objects: 100% (13/13), done. remote: Total 78 (delta 57), reused 78 (delta 57) Unpacking objects: 100% (78/78), done. From github.com:Granicus/CivicIdeas * branch develop -> FETCHHEAD Updating 7872606..5f8e229 Fast-forward Gemfile | 3 + Gemfile.lock | 6 + app/controllers/applicationcontroller.rb | 3 +- app/controllers/developercontroller.rb | 9 +- app/controllers/profilecontroller.rb | 5 +- app/models/company.rb | 5 + app/models/user.rb | 36 ++++- app/views/companies/fields.html.erb | 9 + app/views/developer/ssotest.html.erb | 11 +- app/views/layouts/customizations.html.erb | 8 +- app/views/profile/address.html.erb | 21 +++ app/views/profile/facebookinfo.html.erb | 24 +-- app/views/profile/forms.html.erb | 24 +++ app/views/profile/plainlogininfo.html.erb | 20 +-- config/sites/overrides/locale/granicus/en.yml | 14 ++- public/javascripts/application.js | 4 + public/stylesheets/users.css | 7 +- test/fake/googlecitystatezip | 63 +++++++ test/fake/googleerror | 4 + test/fake/googlefulladdress | 74 ++++++++ test/fake/googlezip | 63 +++++++ test/functional/applicationcontrollertest.rb | 12 +- test/functional/companiescontrollertest.rb | 2 +- test/functional/developercontrollertest.rb | 1 - test/functional/profilecontrollertest.rb | 1 - test/testhelper.rb | 36 +---- test/unit/companytest.rb | 1 - test/unit/usertest.rb | 229 +++++++++++++++--------- 28 files changed, 517 insertions(+), 178 deletions(-) create mode 100644 app/views/profile/address.html.erb create mode 100644 app/views/profile/forms.html.erb create mode 100644 test/fake/googlecitystatezip create mode 100644 test/fake/googleerror create mode 100644 test/fake/googlefulladdress create mode 100644 test/fake/google_zip Ryans-MacBook-Air:CivicIdeas ryan$ git status

On branch develop

Your branch is ahead of 'origin/develop' by 10 commits.

nothing to commit (working directory clean) Ryans-MacBook-Air:CivicIdeas ryan$ git push origin develop Everything up-to-date Ryans-MacBook-Air:CivicIdeas ryan$ git status

On branch develop

nothing to commit (working directory clean) Ryans-MacBook-Air:CivicIdeas ryan$ git branch * develop master release Ryans-MacBook-Air:CivicIdeas ryan$