Dmitriy Zaporozhets 4537623d12 Merge branch 'master' into karlhungus-mr-on-fork ...

Conflicts:
	app/contexts/filter_context.rb
	app/contexts/search_context.rb
	app/models/merge_request.rb
	app/models/note.rb
	app/views/shared/_merge_requests.html.haml
	spec/controllers/commit_controller_spec.rb
	spec/services/notification_service_spec.rb

2013-08-08 12:22:09 +03:00

..

admin

Increase input padding. Minor ui fixes

2013-08-08 11:57:34 +03:00

dashboard

Dashboard/Group issues and mr pages refactoring

2013-08-06 21:12:01 +03:00

devise

Replace page_title with page-title. Correct margin for some blocks/layouts

2013-07-13 08:45:48 +03:00

errors

Replace page_title with page-title. Correct margin for some blocks/layouts

2013-07-13 08:45:48 +03:00

events

Remove ugly button and truncate too long project names. Remove unecessary newlines

2013-07-30 14:12:24 +03:00

groups

Replace xlarge and xxlarge classes

2013-08-07 23:40:29 +03:00

help

Modify style for .slead

2013-08-04 13:16:27 +03:00

kaminari/gitlab

Refactoring & restyle pagination:

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

layouts

Add sing-in button for public area panel

2013-07-29 21:41:05 +03:00

notify

Merge branch 'master' into karlhungus-mr-on-fork

2013-08-08 12:22:09 +03:00

profiles

Increase input padding. Minor ui fixes

2013-08-08 11:57:34 +03:00

projects

Merge branch 'master' into karlhungus-mr-on-fork

2013-08-08 12:22:09 +03:00

public/projects

use control-group classes for inline forms in rest pages

2013-08-07 23:32:20 +03:00

search

Merge branch 'master' into karlhungus-mr-on-fork

2013-08-08 12:22:09 +03:00

shared

Merge branch 'master' into karlhungus-mr-on-fork

2013-08-08 12:22:09 +03:00

snippets

use control-group classes for inline forms in project new/edit pages

2013-08-07 23:28:02 +03:00

users

Replace %h5.title with div.title

2013-07-13 20:36:21 +03:00

users_groups

Ability to edit group member permissions

2013-08-06 18:45:45 +03:00

votes

Redesign issues, mr lists

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