Skip to content

Commit dde50f6

Browse files
author
ben
committed
little bug / updated Gemfile
1 parent c2728fa commit dde50f6

File tree

3 files changed

+19
-23
lines changed

3 files changed

+19
-23
lines changed

Gemfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source "http://rubygems.org"
22

3-
gem "sinatra", "~> 1.1.0"
4-
gem "activerecord", "~> 3.0.0", :require => "active_record"
3+
gem "sinatra"
4+
gem "activerecord", "~> 3.0.6", :require => "active_record"
55
gem "json", "~> 1.5.1"
66
gem "authlogic"
77
gem "rake"
@@ -12,7 +12,6 @@ group :development do
1212
end
1313

1414
group :production do
15-
gem "daemons", "1.0.10"
1615
gem "thin"
1716
gem "mysql", "~> 2.8.1"
1817
end

Gemfile.lock

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
11
GEM
22
remote: http://rubygems.org/
33
specs:
4-
activemodel (3.0.0)
5-
activesupport (= 3.0.0)
4+
activemodel (3.0.6)
5+
activesupport (= 3.0.6)
66
builder (~> 2.1.2)
7-
i18n (~> 0.4.1)
8-
activerecord (3.0.0)
9-
activemodel (= 3.0.0)
10-
activesupport (= 3.0.0)
11-
arel (~> 1.0.0)
7+
i18n (~> 0.5.0)
8+
activerecord (3.0.6)
9+
activemodel (= 3.0.6)
10+
activesupport (= 3.0.6)
11+
arel (~> 2.0.2)
1212
tzinfo (~> 0.3.23)
13-
activesupport (3.0.0)
14-
arel (1.0.1)
15-
activesupport (~> 3.0.0)
13+
activesupport (3.0.6)
14+
arel (2.0.9)
1615
authlogic (2.1.6)
1716
activesupport
1817
builder (2.1.2)
19-
daemons (1.0.10)
18+
daemons (1.1.2)
2019
eventmachine (0.12.10)
21-
i18n (0.4.1)
20+
i18n (0.5.0)
2221
json (1.5.1)
2322
mysql (2.8.1)
24-
rack (1.2.1)
23+
rack (1.2.2)
2524
rake (0.8.7)
2625
shotgun (0.9)
2726
rack (>= 1.0)
28-
sinatra (1.1.2)
27+
sinatra (1.2.3)
2928
rack (~> 1.1)
30-
tilt (~> 1.2)
29+
tilt (>= 1.2.2, < 2.0)
3130
sqlite3 (1.3.3)
3231
sqlite3-ruby (1.3.3)
3332
sqlite3 (>= 1.3.3)
@@ -36,19 +35,18 @@ GEM
3635
eventmachine (>= 0.12.6)
3736
rack (>= 1.0.0)
3837
tilt (1.2.2)
39-
tzinfo (0.3.23)
38+
tzinfo (0.3.26)
4039

4140
PLATFORMS
4241
ruby
4342

4443
DEPENDENCIES
45-
activerecord (~> 3.0.0)
44+
activerecord (~> 3.0.6)
4645
authlogic
47-
daemons (= 1.0.10)
4846
json (~> 1.5.1)
4947
mysql (~> 2.8.1)
5048
rake
5149
shotgun
52-
sinatra (~> 1.1.0)
50+
sinatra
5351
sqlite3-ruby (~> 1.3.3)
5452
thin

lib/helpers.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ def output options={}
8989

9090
if options[:pagination]
9191
count = options[:count] ? options[:count] : params[:model].singularize.capitalize.constantize.count
92-
puts count
9392
#only add paging if the limit is smaller than the amount of all datarecords
9493
if params[:limit] < count
9594
output[:paging] = {}

0 commit comments

Comments
 (0)