Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: DD9/dd9-extranet
base: f312eec168
...
head fork: DD9/dd9-extranet
compare: eb29c0284e
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 34 additions and 34 deletions.
  1. +33 −33 Gemfile.lock
  2. +1 −1  app/views/time_entries/new.html.haml
View
66 Gemfile.lock
@@ -47,7 +47,7 @@ GEM
xpath (~> 0.1.4)
capybara-webkit (0.7.2)
capybara (>= 1.0.0, < 1.2)
- childprocess (0.2.3)
+ childprocess (0.3.0)
ffi (~> 1.0.6)
client_side_validations (3.1.3)
coffee-rails (3.1.1)
@@ -57,18 +57,18 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.1.2)
- cucumber (1.1.3)
+ cucumber (1.1.4)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
- gherkin (~> 2.6.7)
+ gherkin (~> 2.7.1)
json (>= 1.4.6)
term-ansicolor (>= 1.0.6)
- cucumber-rails (1.1.1)
- capybara (>= 1.1.1)
- cucumber (>= 1.1.0)
+ cucumber-rails (1.2.1)
+ capybara (>= 1.1.2)
+ cucumber (>= 1.1.3)
nokogiri (>= 1.5.0)
daemons (1.1.4)
- database_cleaner (0.6.7)
+ database_cleaner (0.7.0)
devise (1.4.9)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
@@ -79,10 +79,10 @@ GEM
eventmachine (1.0.0.beta.3-x86-mingw32)
execjs (1.2.9)
multi_json (~> 1.0)
- factory_girl (2.3.2)
+ factory_girl (2.4.0)
activesupport
- factory_girl_rails (1.4.0)
- factory_girl (~> 2.3.0)
+ factory_girl_rails (1.5.0)
+ factory_girl (~> 2.4.0)
railties (>= 3.0.0)
faker (1.0.1)
i18n (~> 0.4)
@@ -90,21 +90,22 @@ GEM
flutie (1.3.3)
formtastic (2.0.2)
rails (~> 3.0)
- gherkin (2.6.8)
+ gherkin (2.7.3)
json (>= 1.4.6)
- gherkin (2.6.8-x86-mingw32)
+ gherkin (2.7.3-x86-mingw32)
json (>= 1.4.6)
growl_notify (0.0.3)
rb-appscript
- guard (0.8.8)
+ guard (0.10.0)
+ ffi (>= 0.5.0)
thor (~> 0.14.6)
guard-cucumber (0.7.4)
cucumber (>= 0.10)
guard (>= 0.8.3)
- guard-rspec (0.5.8)
- guard (>= 0.8.4)
- guard-spork (0.3.2)
- guard (>= 0.8.4)
+ guard-rspec (0.6.0)
+ guard (>= 0.10.0)
+ guard-spork (0.5.1)
+ guard (>= 0.10.0)
spork (>= 0.8.4)
haml (3.1.3)
haml-rails (0.3.4)
@@ -121,7 +122,6 @@ GEM
railties (~> 3.0)
thor (~> 0.14)
json (1.6.4)
- json_pure (1.6.2)
launchy (2.0.5)
addressable (~> 2.2.6)
mail (2.3.0)
@@ -166,19 +166,19 @@ GEM
rb-fsevent (0.4.3.1)
rdoc (3.12)
json (~> 1.4)
- rspec (2.7.0)
- rspec-core (~> 2.7.0)
- rspec-expectations (~> 2.7.0)
- rspec-mocks (~> 2.7.0)
- rspec-core (2.7.1)
- rspec-expectations (2.7.0)
+ rspec (2.8.0)
+ rspec-core (~> 2.8.0)
+ rspec-expectations (~> 2.8.0)
+ rspec-mocks (~> 2.8.0)
+ rspec-core (2.8.0)
+ rspec-expectations (2.8.0)
diff-lcs (~> 1.1.2)
- rspec-mocks (2.7.0)
- rspec-rails (2.7.0)
- actionpack (~> 3.0)
- activesupport (~> 3.0)
- railties (~> 3.0)
- rspec (~> 2.7.0)
+ rspec-mocks (2.8.0)
+ rspec-rails (2.8.1)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ railties (>= 3.0)
+ rspec (~> 2.8.0)
rubyzip (0.9.5)
sass (3.1.10)
sass-rails (3.1.4)
@@ -187,10 +187,10 @@ GEM
sass (>= 3.1.4)
sprockets (~> 2.0.0)
tilt (~> 1.3.2)
- selenium-webdriver (2.13.0)
- childprocess (>= 0.2.1)
+ selenium-webdriver (2.16.0)
+ childprocess (>= 0.2.5)
ffi (~> 1.0.9)
- json_pure
+ multi_json (~> 1.0.4)
rubyzip
silent-postgres (0.1.1)
spork (0.9.0.rc9)
View
2  app/views/time_entries/new.html.haml
@@ -26,7 +26,7 @@
= semantic_form_for @time_entry, :validate => true, :remote => true do |f|
= f.inputs do
= f.input :date, :as => :string, :input_html => { :class => 'datepicker' }
- = f.input :company, :required => true
+ = f.input :company, :collection => Company.active, :required => true
= f.input :hours, :input_html => {:step => 0.25}
= f.input :description
= f.submit 'Save'

No commit comments for this range

Something went wrong with that request. Please try again.