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

Merge branch 'master' of https://github.com/funglaub/gitlabhq into funglaub-master

Browse source 
Conflicts:
	Gemfile.lock
	app/helpers/application_helper.rb
	app/views/devise/sessions/new.html.erb
	db/schema.rb
This commit is contained in:
Dmitriy Zaporozhets 2012-09-12 06:49:52 +03:00
commit 621affecb5
18 changed files with 189 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/layouts/profile.html.haml
View file

@ -10,7 +10,7 @@
= link_to "Profile", profile_path
%li{class: tab_class(:password)}
= link_to "Password", profile_password_path
= link_to "Authentication", profile_password_path
%li{class: tab_class(:ssh_keys)}
= link_to keys_path do