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

Merge branch 'bootstrap'

Browse source 
Conflicts:
	Gemfile
	app/views/commits/_commits.html.haml
	app/views/projects/empty.html.haml
This commit is contained in:
Dmitriy Zaporozhets 2012-01-30 00:45:35 +02:00
commit 8ebfae9a07
127 changed files with 2464 additions and 2991 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -29,6 +29,7 @@ gem "httparty"
gem "charlock_holmes"
gem "foreman"
gem "omniauth-ldap"
gem 'bootstrap-sass'
group :assets do
gem "sass-rails", "~> 3.1.0"