Dmitriy Zaporozhets c9a2765515 Merge branch '6-2-stable' of dev.gitlab.org:gitlab/gitlabhq into upstream/6-2-stable ...

Conflicts:
	VERSION
	app/models/group.rb
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/api/groups.md
	doc/api/projects.md
	doc/install/installation.md
	lib/api/projects.rb
	spec/requests/api/groups_spec.rb
	spec/requests/api/projects_spec.rb

2013-10-31 14:29:48 +02:00

..

blame

Add titles for blame view and Edit mode

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

blob

Fix blob and repo stuff after gitlab_git v3

2013-10-01 18:26:55 +03:00

branches

avatar upload on profile page

2013-10-09 09:05:09 +02:00

commit

Improve Commit#show page UI

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

commits

avatar upload on profile page

2013-10-09 09:05:09 +02:00

compare

Compare page improved

2013-09-12 20:15:10 +03:00

deploy_keys

Lots of wording improvements for the project settings area

2013-08-15 19:19:29 +01:00

edit_tree

Fix bug in ace-src-noconflict with Relative url.

2013-08-21 09:13:50 +02:00

graphs

Make repo graph work for large repos on slower machines

2013-08-19 20:11:41 +03:00

group_links

Project share UI: Replace groups list with selectbox

2013-10-16 14:17:41 +03:00

hooks

Include project_id in webhook payload.

2013-10-14 12:03:25 +02:00

issues

A few other iids instead of ids (mostly in edit forms)

2013-10-19 09:23:51 +02:00

labels

remove unnecessary %br and title

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

merge_requests

A few other iids instead of ids (mostly in edit forms)

2013-10-19 09:23:51 +02:00

milestones

A few other iids instead of ids (mostly in edit forms)

2013-10-19 09:23:51 +02:00

network

avatar upload on profile page

2013-10-09 09:05:09 +02:00

notes

avatar upload on profile page

2013-10-09 09:05:09 +02: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

avatar upload on profile page

2013-10-09 09:05:09 +02:00

services

Lots of wording improvements for the project settings area

2013-08-15 19:19:29 +01:00

snippets

avatar upload on profile page

2013-10-09 09:05:09 +02:00

tags

Fix new-tag-btn align

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

team_members

avatar upload on profile page

2013-10-09 09:05:09 +02:00

tree

Added links to submodules

2013-10-14 13:27:32 +03:00

walls

Move projects controllers/views in Projects module

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

wikis

Use gitlab_config intead of Gitlab.config.gitlab in views

2013-10-17 22:11:41 +03:00

_clone_panel.html.haml

Modify permissions for project and group

2013-09-25 14:05: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

Improve shared projects title, moved Groups menu item right below Members menu item.

2013-07-11 09:36:38 +03:00

create.js.haml

Reenable the create project button after errors

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

edit.html.haml

Use proper titles for issues trackers

2013-10-09 09:21:53 +02:00

empty.html.haml

Improve the repository import message

2013-10-15 13:58:05 +09:00

fork.html.haml

Error page if forking fails

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

new.html.haml

Use gitlab_config intead of Gitlab.config.gitlab in views

2013-10-17 22:11:41 +03:00

show.html.haml

Avoid 500 error on project page when application is close to RAM limit

2013-10-10 11:05:49 +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