Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
2adc1452
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2adc1452
编写于
12月 22, 2011
作者:
J
Jeremy Kemper
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Depend on 4.0.0.beta gems. Use https for github urls.
上级
e003bafc
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
11 deletion
+11
-11
railties/lib/rails/generators/app_base.rb
railties/lib/rails/generators/app_base.rb
+10
-10
railties/test/generators/shared_generator_tests.rb
railties/test/generators/shared_generator_tests.rb
+1
-1
未找到文件。
railties/lib/rails/generators/app_base.rb
浏览文件 @
2adc1452
...
...
@@ -135,21 +135,21 @@ def rails_gemfile_entry
if
options
.
dev?
<<-
GEMFILE
.
strip_heredoc
gem 'rails', :path => '
#{
Rails
::
Generators
::
RAILS_DEV_PATH
}
'
gem 'journey', :git => '
git
://github.com/rails/journey.git'
gem 'arel', :git => '
git
://github.com/rails/arel.git'
gem 'journey', :git => '
https
://github.com/rails/journey.git'
gem 'arel', :git => '
https
://github.com/rails/arel.git'
GEMFILE
elsif
options
.
edge?
<<-
GEMFILE
.
strip_heredoc
gem 'rails', :git => '
git
://github.com/rails/rails.git'
gem 'journey', :git => '
git
://github.com/rails/journey.git'
gem 'arel', :git => '
git
://github.com/rails/arel.git'
gem 'rails', :git => '
https
://github.com/rails/rails.git'
gem 'journey', :git => '
https
://github.com/rails/journey.git'
gem 'arel', :git => '
https
://github.com/rails/arel.git'
GEMFILE
else
<<-
GEMFILE
.
strip_heredoc
gem 'rails', '
#{
Rails
::
VERSION
::
STRING
}
'
# Bundle edge Rails instead:
# gem 'rails', :git => '
git
://github.com/rails/rails.git'
# gem 'rails', :git => '
https
://github.com/rails/rails.git'
GEMFILE
end
end
...
...
@@ -193,8 +193,8 @@ def assets_gemfile_entry
# Gems used only for assets and not required
# in production environments by default.
group :assets do
gem 'sass-rails', :git => '
git
://github.com/rails/sass-rails.git'
gem 'coffee-rails', :git => '
git
://github.com/rails/coffee-rails.git'
gem 'sass-rails', :git => '
https
://github.com/rails/sass-rails.git'
gem 'coffee-rails', :git => '
https
://github.com/rails/coffee-rails.git'
#{
"gem 'therubyrhino'
\n
"
if
defined?
(
JRUBY_VERSION
)
}
gem 'uglifier', '>= 1.0.3'
end
...
...
@@ -204,8 +204,8 @@ def assets_gemfile_entry
# Gems used only for assets and not required
# in production environments by default.
group :assets do
gem 'sass-rails', '~>
3.2.0
'
gem 'coffee-rails', '~>
3.2.0
'
gem 'sass-rails', '~>
4.0.0.beta
'
gem 'coffee-rails', '~>
4.0.0.beta
'
#{
"gem 'therubyrhino'
\n
"
if
defined?
(
JRUBY_VERSION
)
}
gem 'uglifier', '>= 1.0.3'
end
...
...
railties/test/generators/shared_generator_tests.rb
浏览文件 @
2adc1452
...
...
@@ -125,7 +125,7 @@ def test_dev_option
def
test_edge_option
generator
([
destination_root
],
:edge
=>
true
).
expects
(
:bundle_command
).
with
(
'install'
).
once
quietly
{
generator
.
invoke_all
}
assert_file
'Gemfile'
,
%r{^gem
\s
+["']rails["'],
\s
+:git
\s
+=>
\s
+["']
#{
Regexp
.
escape
(
"
git
://github.com/rails/rails.git"
)
}
["']$}
assert_file
'Gemfile'
,
%r{^gem
\s
+["']rails["'],
\s
+:git
\s
+=>
\s
+["']
#{
Regexp
.
escape
(
"
https
://github.com/rails/rails.git"
)
}
["']$}
end
def
test_skip_gemfile
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录