Dmitriy Zaporozhets d41940d36e Merge branch 'master' into 6-0-dev ...

Conflicts:
	app/views/projects/issues/show.html.haml
	db/fixtures/development/09_issues.rb
	db/fixtures/development/10_merge_requests.rb

2013-06-24 22:13:00 +03:00

..

admin

Cleanup: removed unused routing/methods. Improved admin area usability

2013-06-22 14:11:20 +03:00

dashboard

Move projects controllers/views in Projects module

2013-06-23 19:47:22 +03:00

devise

Better name for sign in tab

2013-06-21 09:19:31 +03:00

errors

No gitolite in project any more

2013-02-11 19:16:59 +02:00

events

Refactor event title for notes

2013-06-07 18:46:33 +03:00

groups

Move projects controllers/views in Projects module

2013-06-23 19:47:22 +03:00

help

remove outdated permission option from help page

2013-06-07 18:28:47 +03:00

kaminari/gitlab

Refactoring & restyle pagination:

2013-04-06 22:32:23 +03:00

layouts

Move Profile related controllers under Profiles:: module

2013-06-24 18:24:14 +03:00

notify

Fix profile emails with new key route

2013-06-24 19:24:27 +03:00

profiles

store and display public key fingerprint

2013-06-24 20:07:21 +03:00

projects

Merge branch 'master' into 6-0-dev

2013-06-24 22:13:00 +03:00

public/projects

Add simple search to projects in public area

2013-05-13 21:18:08 +03:00

search

Remove $.ready events

2013-06-21 22:08:16 +03:00

shared

Fix new ssh key link from shared partial

2013-06-24 18:26:57 +03:00

snippets

Lets fix tests

2013-06-22 23:57:29 +03:00

users

Remove invalid information from /u/:user page

2013-06-21 16:16:05 +03:00

users_groups

You should not be able to remove a Group owner

2013-06-22 11:02:31 +03:00

votes

Redesign issues, mr lists

2013-04-06 15:10:24 +03:00