Merge branch 'master' into discussions
Showing
... | ... | @@ -71,7 +71,6 @@ gem "redcarpet", "~> 2.2.2" |
gem "github-markup", "~> 0.7.4", require: 'github/markup' | ||
# Servers | ||
gem "thin", '~> 1.5.0' | ||
gem "unicorn", "~> 4.4.0" | ||
# Issue tags | ||
... | ... | @@ -111,7 +110,7 @@ group :assets do |
gem "modernizr", "2.6.2" | ||
gem "raphael-rails", git: "https://github.com/gitlabhq/raphael-rails.git" | ||
gem 'bootstrap-sass', "2.2.1.1" | ||
gem "font-awesome-sass-rails", "~> 2.0.0" | ||
gem "font-awesome-sass-rails", "~> 3.0.0" | ||
gem "gemoji", "~> 1.2.1", require: 'emoji/railtie' | ||
end | ||
... | ... |
177 字节
295 字节
749 字节
302 字节
750 字节
463 字节
632 字节
1.3 KB
463 字节
632 字节
357 字节
app/views/keys/create.js.haml
已删除
100644 → 0
app/views/keys/new.js.haml
已删除
100644 → 0