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

..

blame

Add titles for blame view and Edit mode

2013-08-01 15:21:43 +03:00

blob

Dont load bootstrap buttons. Modified css with new buttons

2013-08-01 22:35:40 +03:00

branches

Refactor recent branches page

2013-08-05 17:59:58 +03:00

commit

Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork

2013-07-30 13:35:33 +03:00

commits

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

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

compare

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

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

deploy_keys

Increase input padding. Minor ui fixes

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

edit_tree

Add titles for blame view and Edit mode

2013-08-01 15:21:43 +03:00

graphs

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

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

hooks

Increase input padding. Minor ui fixes

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

issues

Merge branch 'improve/proper_form_classes' of /home/git/repositories/gitlab/gitlabhq

2013-08-07 20:55:39 +00:00

labels

remove unnecessary %br and title

2013-07-17 14:53:23 +03:00

merge_requests

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

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

milestones

use control-group classes for inline forms in project area pages

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

network

Replace xlarge and xxlarge classes

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

notes

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

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

protected_branches

Refactor recent branches page

2013-08-05 17:59:58 +03:00

refs

Prevent tree log crash if commit missing

2013-07-02 14:26:13 +03:00

repositories

Refactor recent branches page

2013-08-05 17:59:58 +03:00

services

remove unnecessary %br/%hr and styles

2013-07-13 09:05:28 +03:00

snippets

use control-group classes for inline forms in project area pages

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

tags

Fix new-tag-btn align

2013-07-18 10:29:45 +03:00

team_members

Replace .actions with .form-actions

2013-08-07 23:35:24 +03:00

tree

scss: rename file_content to file-content etc

2013-07-13 09:52:47 +03:00

walls

Move projects controllers/views in Projects module

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

wikis

Increase input padding. Minor ui fixes

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

_clone_panel.html.haml

Better control placement on project page

2013-07-09 17:44:35 +03:00

_errors.html.haml

Improve user expirience while create/edit project settings

2013-05-14 12:46:41 +03:00

_settings_nav.html.haml

Squash project settings navs

2013-06-19 22:44:57 +03:00

create.js.haml

Reenable the create project button after errors

2013-07-30 13:45:53 +01:00

edit.html.haml

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

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

empty.html.haml

Better remove project message

2013-05-20 14:22:18 +03:00

fork.html.haml

Error page if forking fails

2013-06-10 21:40:23 +03:00

new.html.haml

Increase input padding. Minor ui fixes

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

show.html.haml

Fix tags path

2013-07-16 23:19:59 +03:00

show.js.haml

Project activity inifinite scroll paging

2012-09-26 21:01:54 +03:00

transfer.js.haml

Use TransferContext for project

2013-03-25 10:47:22 +02:00

update.js.haml

Improve user expirience while create/edit project settings

2013-05-14 12:46:41 +03:00