Skip to content

Commit 87b86a3

Browse files
committed
Update all the things!
1 parent 9d2df38 commit 87b86a3

File tree

2 files changed

+83
-86
lines changed

2 files changed

+83
-86
lines changed

Gemfile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
source 'https://rubygems.org'
22

33
gem 'rails', '~> 4.2.0'
4-
gem 'sass-rails', '~> 5.0'
5-
gem 'uglifier', '>= 1.3.0'
6-
gem 'coffee-rails', '~> 4.1.0'
4+
gem 'sass-rails'
5+
gem 'uglifier'
6+
gem 'coffee-rails'
77
gem 'jquery-rails'
8-
gem 'jbuilder', '~> 2.0'
8+
gem 'jbuilder'
99

10-
gem 'activerecord-sqlserver-adapter', path: '/Users/kencollins/Repositories/activerecord-sqlserver-adapter'
11-
gem 'tiny_tds', '0.9.5.rc2'
10+
gem 'activerecord-sqlserver-adapter'
11+
gem 'tiny_tds'
1212

1313
group :development, :test do
1414
gem 'byebug'
1515
gem 'web-console', '~> 2.0'
1616
gem 'spring'
1717
end
18-

Gemfile.lock

Lines changed: 77 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,137 +1,135 @@
1-
PATH
2-
remote: /Users/kencollins/Repositories/activerecord-sqlserver-adapter
3-
specs:
4-
activerecord-sqlserver-adapter (4.2.8)
5-
activerecord (~> 4.2.1)
6-
71
GEM
82
remote: https://rubygems.org/
93
specs:
10-
actionmailer (4.2.5.1)
11-
actionpack (= 4.2.5.1)
12-
actionview (= 4.2.5.1)
13-
activejob (= 4.2.5.1)
4+
actionmailer (4.2.7.1)
5+
actionpack (= 4.2.7.1)
6+
actionview (= 4.2.7.1)
7+
activejob (= 4.2.7.1)
148
mail (~> 2.5, >= 2.5.4)
159
rails-dom-testing (~> 1.0, >= 1.0.5)
16-
actionpack (4.2.5.1)
17-
actionview (= 4.2.5.1)
18-
activesupport (= 4.2.5.1)
10+
actionpack (4.2.7.1)
11+
actionview (= 4.2.7.1)
12+
activesupport (= 4.2.7.1)
1913
rack (~> 1.6)
2014
rack-test (~> 0.6.2)
2115
rails-dom-testing (~> 1.0, >= 1.0.5)
2216
rails-html-sanitizer (~> 1.0, >= 1.0.2)
23-
actionview (4.2.5.1)
24-
activesupport (= 4.2.5.1)
17+
actionview (4.2.7.1)
18+
activesupport (= 4.2.7.1)
2519
builder (~> 3.1)
2620
erubis (~> 2.7.0)
2721
rails-dom-testing (~> 1.0, >= 1.0.5)
2822
rails-html-sanitizer (~> 1.0, >= 1.0.2)
29-
activejob (4.2.5.1)
30-
activesupport (= 4.2.5.1)
23+
activejob (4.2.7.1)
24+
activesupport (= 4.2.7.1)
3125
globalid (>= 0.3.0)
32-
activemodel (4.2.5.1)
33-
activesupport (= 4.2.5.1)
26+
activemodel (4.2.7.1)
27+
activesupport (= 4.2.7.1)
3428
builder (~> 3.1)
35-
activerecord (4.2.5.1)
36-
activemodel (= 4.2.5.1)
37-
activesupport (= 4.2.5.1)
29+
activerecord (4.2.7.1)
30+
activemodel (= 4.2.7.1)
31+
activesupport (= 4.2.7.1)
3832
arel (~> 6.0)
39-
activesupport (4.2.5.1)
33+
activerecord-sqlserver-adapter (4.2.16)
34+
activerecord (~> 4.2.1)
35+
activesupport (4.2.7.1)
4036
i18n (~> 0.7)
4137
json (~> 1.7, >= 1.7.7)
4238
minitest (~> 5.1)
4339
thread_safe (~> 0.3, >= 0.3.4)
4440
tzinfo (~> 1.1)
45-
arel (6.0.3)
41+
arel (6.0.4)
4642
binding_of_caller (0.7.2)
4743
debug_inspector (>= 0.0.1)
48-
builder (3.2.2)
49-
byebug (8.2.2)
50-
coffee-rails (4.1.1)
44+
builder (3.2.3)
45+
byebug (9.0.6)
46+
coffee-rails (4.2.1)
5147
coffee-script (>= 2.2.0)
52-
railties (>= 4.0.0, < 5.1.x)
48+
railties (>= 4.0.0, < 5.2.x)
5349
coffee-script (2.4.1)
5450
coffee-script-source
5551
execjs
56-
coffee-script-source (1.10.0)
57-
concurrent-ruby (1.0.0)
52+
coffee-script-source (1.12.2)
53+
concurrent-ruby (1.0.4)
5854
debug_inspector (0.0.2)
5955
erubis (2.7.0)
60-
execjs (2.6.0)
61-
globalid (0.3.6)
56+
execjs (2.7.0)
57+
globalid (0.3.7)
6258
activesupport (>= 4.1.0)
6359
i18n (0.7.0)
64-
jbuilder (2.4.1)
60+
jbuilder (2.6.1)
6561
activesupport (>= 3.0.0, < 5.1)
6662
multi_json (~> 1.2)
67-
jquery-rails (4.1.0)
68-
rails-dom-testing (~> 1.0)
63+
jquery-rails (4.2.2)
64+
rails-dom-testing (>= 1, < 3)
6965
railties (>= 4.2.0)
7066
thor (>= 0.14, < 2.0)
71-
json (1.8.3)
67+
json (1.8.6)
7268
loofah (2.0.3)
7369
nokogiri (>= 1.5.9)
74-
mail (2.6.3)
75-
mime-types (>= 1.16, < 3)
76-
mime-types (2.99)
77-
mini_portile2 (2.0.0)
78-
minitest (5.8.4)
79-
multi_json (1.11.2)
80-
nokogiri (1.6.7.2)
81-
mini_portile2 (~> 2.0.0.rc2)
82-
rack (1.6.4)
70+
mail (2.6.4)
71+
mime-types (>= 1.16, < 4)
72+
mime-types (3.1)
73+
mime-types-data (~> 3.2015)
74+
mime-types-data (3.2016.0521)
75+
mini_portile2 (2.1.0)
76+
minitest (5.10.1)
77+
multi_json (1.12.1)
78+
nokogiri (1.7.0.1)
79+
mini_portile2 (~> 2.1.0)
80+
rack (1.6.5)
8381
rack-test (0.6.3)
8482
rack (>= 1.0)
85-
rails (4.2.5.1)
86-
actionmailer (= 4.2.5.1)
87-
actionpack (= 4.2.5.1)
88-
actionview (= 4.2.5.1)
89-
activejob (= 4.2.5.1)
90-
activemodel (= 4.2.5.1)
91-
activerecord (= 4.2.5.1)
92-
activesupport (= 4.2.5.1)
83+
rails (4.2.7.1)
84+
actionmailer (= 4.2.7.1)
85+
actionpack (= 4.2.7.1)
86+
actionview (= 4.2.7.1)
87+
activejob (= 4.2.7.1)
88+
activemodel (= 4.2.7.1)
89+
activerecord (= 4.2.7.1)
90+
activesupport (= 4.2.7.1)
9391
bundler (>= 1.3.0, < 2.0)
94-
railties (= 4.2.5.1)
92+
railties (= 4.2.7.1)
9593
sprockets-rails
9694
rails-deprecated_sanitizer (1.0.3)
9795
activesupport (>= 4.2.0.alpha)
98-
rails-dom-testing (1.0.7)
96+
rails-dom-testing (1.0.8)
9997
activesupport (>= 4.2.0.beta, < 5.0)
100-
nokogiri (~> 1.6.0)
98+
nokogiri (~> 1.6)
10199
rails-deprecated_sanitizer (>= 1.0.1)
102100
rails-html-sanitizer (1.0.3)
103101
loofah (~> 2.0)
104-
railties (4.2.5.1)
105-
actionpack (= 4.2.5.1)
106-
activesupport (= 4.2.5.1)
102+
railties (4.2.7.1)
103+
actionpack (= 4.2.7.1)
104+
activesupport (= 4.2.7.1)
107105
rake (>= 0.8.7)
108106
thor (>= 0.18.1, < 2.0)
109-
rake (10.5.0)
110-
sass (3.4.21)
111-
sass-rails (5.0.4)
112-
railties (>= 4.0.0, < 5.0)
107+
rake (12.0.0)
108+
sass (3.4.23)
109+
sass-rails (5.0.6)
110+
railties (>= 4.0.0, < 6)
113111
sass (~> 3.1)
114112
sprockets (>= 2.8, < 4.0)
115113
sprockets-rails (>= 2.0, < 4.0)
116114
tilt (>= 1.1, < 3)
117-
spring (1.6.3)
118-
sprockets (3.5.2)
115+
spring (2.0.1)
116+
activesupport (>= 4.2)
117+
sprockets (3.7.1)
119118
concurrent-ruby (~> 1.0)
120119
rack (> 1, < 3)
121-
sprockets-rails (3.0.1)
120+
sprockets-rails (3.2.0)
122121
actionpack (>= 4.0)
123122
activesupport (>= 4.0)
124123
sprockets (>= 3.0.0)
125-
thor (0.19.1)
124+
thor (0.19.4)
126125
thread_safe (0.3.5)
127-
tilt (2.0.2)
128-
tiny_tds (0.9.5.rc.2)
126+
tilt (2.0.6)
127+
tiny_tds (1.1.0)
129128
mini_portile2 (~> 2.0)
130129
tzinfo (1.2.2)
131130
thread_safe (~> 0.1)
132-
uglifier (2.7.2)
133-
execjs (>= 0.3.0)
134-
json (>= 1.8.0)
131+
uglifier (3.0.4)
132+
execjs (>= 0.3.0, < 3)
135133
web-console (2.3.0)
136134
activemodel (>= 4.0)
137135
binding_of_caller (>= 0.7.2)
@@ -142,17 +140,17 @@ PLATFORMS
142140
ruby
143141

144142
DEPENDENCIES
145-
activerecord-sqlserver-adapter!
143+
activerecord-sqlserver-adapter
146144
byebug
147-
coffee-rails (~> 4.1.0)
148-
jbuilder (~> 2.0)
145+
coffee-rails
146+
jbuilder
149147
jquery-rails
150148
rails (~> 4.2.0)
151-
sass-rails (~> 5.0)
149+
sass-rails
152150
spring
153-
tiny_tds (= 0.9.5.rc2)
154-
uglifier (>= 1.3.0)
151+
tiny_tds
152+
uglifier
155153
web-console (~> 2.0)
156154

157155
BUNDLED WITH
158-
1.11.2
156+
1.13.6

0 commit comments

Comments
 (0)