aheward/kuality-coeus — pull request #3 by jonutter (2013-12-18 16:31:32+00:00)
Title: Squashed commit of the following:

commit e384ea949de84ee4c7a816b25b3a219e8a60aa98
Author: Jonathan Utter
Date: Tue Dec 17 15:18:40 2013 -0700

Re-added a line of code to check an IP's status. This was removed accidentally

commit 6a177fc4d92b2f8202d9938872f167f8c0f35978
Merge: 92d47e0 8f2580c
Author: Jonathan Utter
Date: Tue Dec 17 14:32:42 2013 -0700

Merge remote-tracking branch 'upstream/development' into development

* upstream/development:
Updates related to trying to remove an FP from an Award.
Updates related to trying to remove an FP from an Award.
Had to create a specialized step definition for a particular scenario.
Removed some dummy code that wasn't supposed to be there.
Removal of the $ips global variable from the step definitions for funding awards. Fixes to a verification step definition.

Conflicts:
features/step_definitions/awards/award_fund.rb

commit 92d47e071b11365101c24188154e765345c0ca78
Author: Jonathan Utter
Date: Tue Dec 17 14:24:10 2013 -0700

created a new scenario to check for the generation of new ip's.

commit 047677ce9a8cce1b27b414e6fe585ff9fbd76e18
Author: Jonathan Utter
Date: Mon Dec 16 10:25:17 2013 -0700

New scenario to check for updated ip status, post award attachment.

commit 66471821aded95a3ebdcae397f8d2541a405facb
Merge: f2ebc57 4d132a8
Author: Jonathan Utter
Date: Fri Dec 13 13:26:49 2013 -0700

Merge branch 'development' of github.com:aheward/kuality-coeus into development

* 'development' of github.com:aheward/kuality-coeus:
Code refactoring to move a method out of ProposalDevelopment Object and into a shared module.

commit f2ebc575982d267c9e0cbfcfd5422944304e9793
Merge: aa7b492 8326629
Author: Jonathan Utter
Date: Fri Dec 13 11:50:04 2013 -0700

removed all instances of 'initiate' where the context was a user creating something

commit aa7b492660540d2443c5d7aefb01c5c48f4085a2
Author: Jonathan Utter
Date: Fri Dec 13 11:12:40 2013 -0700

Modification: Created new 'Award Modifer creates an award../..

commit 1c4003c3ab49e5895cf0118758cda80ce2145a03
Merge: 79f6c46 c673904
Author: Jonathan Utter
Date: Fri Dec 13 11:05:18 2013 -0700

fixed the last two scenarios in 'adding_funding_proposals_to_an_award.feature

commit 79f6c46228e4b59efbdaa27ed355a69444872493
Author: Jonathan Utter
Date: Fri Dec 13 10:12:03 2013 -0700

created new feature file for linking ip to awards

commit 4e58fb01f67b6c49dbe9fd9d2995db96045c4e5b
Author: Jonathan Utter
Date: Fri Dec 13 09:57:23 2013 -0700

deleted the award_fund.feature file