Merge branch 'link-to-issue-tracker' of https://github.com/Undev/gitlabhq into...
Merge branch 'link-to-issue-tracker' of https://github.com/Undev/gitlabhq into Undev-link-to-issue-tracker Conflicts: Gemfile.lock
Showing
... | @@ -46,6 +46,9 @@ gem "grape-entity", "~> 0.2.0" | ... | @@ -46,6 +46,9 @@ gem "grape-entity", "~> 0.2.0" |
# based on human-friendly examples | # based on human-friendly examples | ||
gem "stamp" | gem "stamp" | ||
# Enumeration fields | |||
gem 'enumerize' | |||
# Pagination | # Pagination | ||
gem "kaminari", "~> 0.14.1" | gem "kaminari", "~> 0.14.1" | ||
... | @@ -113,6 +116,7 @@ group :assets do | ... | @@ -113,6 +116,7 @@ group :assets do |
gem 'bootstrap-sass', "2.2.1.1" | gem 'bootstrap-sass', "2.2.1.1" | ||
gem "font-awesome-sass-rails", "~> 3.0.0" | gem "font-awesome-sass-rails", "~> 3.0.0" | ||
gem "gemoji", "~> 1.2.1", require: 'emoji/railtie' | gem "gemoji", "~> 1.2.1", require: 'emoji/railtie' | ||
gem "gon" | |||
end | end | ||
group :development do | group :development do | ||
... | ... |
想要评论请 注册 或 登录