Skip to content
This repository was archived by the owner on Jun 26, 2019. It is now read-only.

Commit 111eb0f

Browse files
Eric-Guohuacnlee
authored andcommitted
To running at ruby 2.3.1 and Rails 5.0.0.1 (#15)
1 parent 111d095 commit 111eb0f

File tree

4 files changed

+97
-86
lines changed

4 files changed

+97
-86
lines changed

Diff for: DEV-GUIDES.md

+9
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,12 @@ $ rails s
1010
```
1111

1212
然后浏览器访问: http://localhost:3000
13+
14+
# 如何允许测试
15+
16+
```
17+
$ rails db:migrate RAILS_ENV=test
18+
$ rake
19+
```
20+
21+

Diff for: Gemfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
source 'https://rubygems.org'
22

3-
ruby '2.3.0'
3+
ruby '2.3.1'
44

55
gemspec
66

7-
gem 'rails', '5.0.0.beta3'
7+
gem 'rails', '~> 5.0.0'
88
gem 'sass-rails'
99
gem 'uglifier'
1010
gem 'coffee-rails'
1111
gem 'github-markup'
12-
gem 'devise', '4.0.0.rc2'
12+
gem 'devise', '~> 4.2.0'
1313
gem 'jquery-rails'
1414
gem 'mysql2'
1515
gem 'puma'

Diff for: Gemfile.lock

+84-82
Original file line numberDiff line numberDiff line change
@@ -12,159 +12,158 @@ PATH
1212
GEM
1313
remote: https://rubygems.org/
1414
specs:
15-
actioncable (5.0.0.beta3)
16-
actionpack (= 5.0.0.beta3)
15+
actioncable (5.0.0.1)
16+
actionpack (= 5.0.0.1)
1717
nio4r (~> 1.2)
1818
websocket-driver (~> 0.6.1)
19-
actionmailer (5.0.0.beta3)
20-
actionpack (= 5.0.0.beta3)
21-
actionview (= 5.0.0.beta3)
22-
activejob (= 5.0.0.beta3)
19+
actionmailer (5.0.0.1)
20+
actionpack (= 5.0.0.1)
21+
actionview (= 5.0.0.1)
22+
activejob (= 5.0.0.1)
2323
mail (~> 2.5, >= 2.5.4)
24-
rails-dom-testing (~> 1.0, >= 1.0.5)
25-
actionpack (5.0.0.beta3)
26-
actionview (= 5.0.0.beta3)
27-
activesupport (= 5.0.0.beta3)
28-
rack (~> 2.x)
24+
rails-dom-testing (~> 2.0)
25+
actionpack (5.0.0.1)
26+
actionview (= 5.0.0.1)
27+
activesupport (= 5.0.0.1)
28+
rack (~> 2.0)
2929
rack-test (~> 0.6.3)
30-
rails-dom-testing (~> 1.0, >= 1.0.5)
30+
rails-dom-testing (~> 2.0)
3131
rails-html-sanitizer (~> 1.0, >= 1.0.2)
32-
actionview (5.0.0.beta3)
33-
activesupport (= 5.0.0.beta3)
32+
actionview (5.0.0.1)
33+
activesupport (= 5.0.0.1)
3434
builder (~> 3.1)
3535
erubis (~> 2.7.0)
36-
rails-dom-testing (~> 1.0, >= 1.0.5)
36+
rails-dom-testing (~> 2.0)
3737
rails-html-sanitizer (~> 1.0, >= 1.0.2)
38-
activejob (5.0.0.beta3)
39-
activesupport (= 5.0.0.beta3)
38+
activejob (5.0.0.1)
39+
activesupport (= 5.0.0.1)
4040
globalid (>= 0.3.6)
41-
activemodel (5.0.0.beta3)
42-
activesupport (= 5.0.0.beta3)
43-
activerecord (5.0.0.beta3)
44-
activemodel (= 5.0.0.beta3)
45-
activesupport (= 5.0.0.beta3)
41+
activemodel (5.0.0.1)
42+
activesupport (= 5.0.0.1)
43+
activerecord (5.0.0.1)
44+
activemodel (= 5.0.0.1)
45+
activesupport (= 5.0.0.1)
4646
arel (~> 7.0)
47-
activesupport (5.0.0.beta3)
48-
concurrent-ruby (~> 1.0)
47+
activesupport (5.0.0.1)
48+
concurrent-ruby (~> 1.0, >= 1.0.2)
4949
i18n (~> 0.7)
5050
minitest (~> 5.1)
5151
tzinfo (~> 1.1)
52-
arel (7.0.0)
52+
arel (7.1.1)
5353
bcrypt (3.1.11)
5454
builder (3.2.2)
55-
codecov (0.1.4)
55+
codecov (0.1.5)
5656
json
5757
simplecov
5858
url
59-
coffee-rails (4.1.1)
59+
coffee-rails (4.2.1)
6060
coffee-script (>= 2.2.0)
61-
railties (>= 4.0.0, < 5.1.x)
61+
railties (>= 4.0.0, < 5.2.x)
6262
coffee-script (2.4.1)
6363
coffee-script-source
6464
execjs
6565
coffee-script-source (1.10.0)
66-
concurrent-ruby (1.0.1)
67-
devise (4.0.0.rc2)
66+
concurrent-ruby (1.0.2)
67+
devise (4.2.0)
6868
bcrypt (~> 3.0)
6969
orm_adapter (~> 0.1)
7070
railties (>= 4.1.0, < 5.1)
7171
responders
7272
warden (~> 1.2.3)
7373
docile (1.1.5)
7474
erubis (2.7.0)
75-
execjs (2.6.0)
76-
factory_girl (4.5.0)
75+
execjs (2.7.0)
76+
factory_girl (4.7.0)
7777
activesupport (>= 3.0.0)
78-
font-awesome-rails (4.5.0.1)
78+
font-awesome-rails (4.6.3.1)
7979
railties (>= 3.2, < 5.1)
8080
github-markup (1.4.0)
81-
globalid (0.3.6)
81+
globalid (0.3.7)
8282
activesupport (>= 4.1.0)
8383
i18n (0.7.0)
84-
jquery-rails (4.1.1)
84+
jquery-rails (4.2.1)
8585
rails-dom-testing (>= 1, < 3)
8686
railties (>= 4.2.0)
8787
thor (>= 0.14, < 2.0)
88-
json (1.8.3)
88+
json (2.0.2)
8989
loofah (2.0.3)
9090
nokogiri (>= 1.5.9)
91-
mail (2.6.3)
92-
mime-types (>= 1.16, < 3)
91+
mail (2.6.4)
92+
mime-types (>= 1.16, < 4)
9393
method_source (0.8.2)
94-
mime-types (2.99.1)
95-
mini_portile2 (2.0.0)
96-
minitest (5.8.4)
97-
mysql2 (0.4.3)
94+
mime-types (3.1)
95+
mime-types-data (~> 3.2015)
96+
mime-types-data (3.2016.0521)
97+
mini_portile2 (2.1.0)
98+
minitest (5.9.0)
99+
mysql2 (0.4.4)
98100
nio4r (1.2.1)
99-
nokogiri (1.6.7.2)
100-
mini_portile2 (~> 2.0.0.rc2)
101+
nokogiri (1.6.8)
102+
mini_portile2 (~> 2.1.0)
103+
pkg-config (~> 1.1.7)
101104
orm_adapter (0.5.0)
102-
puma (3.2.0)
103-
rack (2.0.0.alpha)
104-
json
105+
pkg-config (1.1.7)
106+
puma (3.6.0)
107+
rack (2.0.1)
105108
rack-test (0.6.3)
106109
rack (>= 1.0)
107-
rails (5.0.0.beta3)
108-
actioncable (= 5.0.0.beta3)
109-
actionmailer (= 5.0.0.beta3)
110-
actionpack (= 5.0.0.beta3)
111-
actionview (= 5.0.0.beta3)
112-
activejob (= 5.0.0.beta3)
113-
activemodel (= 5.0.0.beta3)
114-
activerecord (= 5.0.0.beta3)
115-
activesupport (= 5.0.0.beta3)
110+
rails (5.0.0.1)
111+
actioncable (= 5.0.0.1)
112+
actionmailer (= 5.0.0.1)
113+
actionpack (= 5.0.0.1)
114+
actionview (= 5.0.0.1)
115+
activejob (= 5.0.0.1)
116+
activemodel (= 5.0.0.1)
117+
activerecord (= 5.0.0.1)
118+
activesupport (= 5.0.0.1)
116119
bundler (>= 1.3.0, < 2.0)
117-
railties (= 5.0.0.beta3)
120+
railties (= 5.0.0.1)
118121
sprockets-rails (>= 2.0.0)
119-
rails-deprecated_sanitizer (1.0.3)
120-
activesupport (>= 4.2.0.alpha)
121-
rails-dom-testing (1.0.7)
122-
activesupport (>= 4.2.0.beta, < 5.0)
122+
rails-dom-testing (2.0.1)
123+
activesupport (>= 4.2.0, < 6.0)
123124
nokogiri (~> 1.6.0)
124-
rails-deprecated_sanitizer (>= 1.0.1)
125125
rails-html-sanitizer (1.0.3)
126126
loofah (~> 2.0)
127-
railties (5.0.0.beta3)
128-
actionpack (= 5.0.0.beta3)
129-
activesupport (= 5.0.0.beta3)
127+
railties (5.0.0.1)
128+
actionpack (= 5.0.0.1)
129+
activesupport (= 5.0.0.1)
130130
method_source
131131
rake (>= 0.8.7)
132132
thor (>= 0.18.1, < 2.0)
133-
rake (11.1.1)
133+
rake (11.2.2)
134134
redcarpet (3.3.4)
135-
responders (2.1.2)
135+
responders (2.3.0)
136136
railties (>= 4.2.0, < 5.1)
137-
sass (3.4.21)
138-
sass-rails (5.0.4)
139-
railties (>= 4.0.0, < 5.0)
137+
sass (3.4.22)
138+
sass-rails (5.0.6)
139+
railties (>= 4.0.0, < 6)
140140
sass (~> 3.1)
141141
sprockets (>= 2.8, < 4.0)
142142
sprockets-rails (>= 2.0, < 4.0)
143143
tilt (>= 1.1, < 3)
144-
simplecov (0.11.2)
144+
simplecov (0.12.0)
145145
docile (~> 1.1.0)
146-
json (~> 1.8)
146+
json (>= 1.8, < 3)
147147
simplecov-html (~> 0.10.0)
148148
simplecov-html (0.10.0)
149-
sprockets (3.5.2)
149+
sprockets (3.7.0)
150150
concurrent-ruby (~> 1.0)
151151
rack (> 1, < 3)
152-
sprockets-rails (3.0.4)
152+
sprockets-rails (3.2.0)
153153
actionpack (>= 4.0)
154154
activesupport (>= 4.0)
155155
sprockets (>= 3.0.0)
156156
thor (0.19.1)
157157
thread_safe (0.3.5)
158-
tilt (2.0.2)
158+
tilt (2.0.5)
159159
tzinfo (1.2.2)
160160
thread_safe (~> 0.1)
161-
uglifier (2.7.2)
162-
execjs (>= 0.3.0)
163-
json (>= 1.8.0)
161+
uglifier (3.0.2)
162+
execjs (>= 0.3.0, < 3)
164163
url (0.3.2)
165164
warden (1.2.6)
166165
rack (>= 1.0)
167-
websocket-driver (0.6.3)
166+
websocket-driver (0.6.4)
168167
websocket-extensions (>= 0.1.0)
169168
websocket-extensions (0.1.2)
170169
will_paginate (3.1.0)
@@ -175,18 +174,21 @@ PLATFORMS
175174
DEPENDENCIES
176175
codecov
177176
coffee-rails
178-
devise (= 4.0.0.rc2)
177+
devise (~> 4.2.0)
179178
factory_girl
180179
github-markup
181180
homeland!
182181
jquery-rails
183182
minitest
184183
mysql2
185184
puma
186-
rails (= 5.0.0.beta3)
185+
rails (~> 5.0.0)
187186
sass-rails
188187
simplecov
189188
uglifier
190189

190+
RUBY VERSION
191+
ruby 2.3.1p112
192+
191193
BUNDLED WITH
192-
1.11.2
194+
1.12.5

Diff for: README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Homeland 是基于 Rails Engine 实现的论坛社区 Gem,用于快速开发
3333

3434
仅仅需要几步,就能集成到你的任何应用(当然我说的是 Rails + ActiveRecord 的!)。
3535

36-
> [提示]: Homeland 的默认配置是增对 Devise 设计的,你可以从配置文件里面看到,很多参数都是 Devise 的默认值。所以我建议大家尽可能的使用 Devise 来配合(如果情况允许的话),否则你需要实现一些必要的参数,详见后面的配置文件说明。
36+
> [提示]: Homeland 的默认配置是针对 Devise 设计的,你可以从配置文件里面看到,很多参数都是 Devise 的默认值。所以我建议大家尽可能的使用 Devise 来配合(如果情况允许的话),否则你需要实现一些必要的参数,详见后面的配置文件说明。
3737
3838
1. 修改 Gemfile 增加:
3939

0 commit comments

Comments
 (0)