deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'link-to-issue-tracker' of https://github.com/Undev/gitlabhq into Undev-link-to-issue-tracker

Browse source 
Conflicts:
	Gemfile.lock
This commit is contained in:
Dmitriy Zaporozhets 2013-02-28 17:02:20 +02:00
commit e1f77b9be0
20 changed files with 299 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -46,6 +46,9 @@ gem "grape-entity", "~> 0.2.0"
# based on human-friendly examples
gem "stamp"
# Enumeration fields
gem 'enumerize'
# Pagination
gem "kaminari", "~> 0.14.1"
@ -113,6 +116,7 @@ group :assets do
gem 'bootstrap-sass', "2.2.1.1"
gem "font-awesome-sass-rails", "~> 3.0.0"
gem "gemoji", "~> 1.2.1", require: 'emoji/railtie'
gem "gon"
end
group :development do