Dmitriy Zaporozhets 4e77b0b52d Merge branch '6-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3 ...

Conflicts:
	Gemfile.lock
	VERSION
	app/assets/javascripts/api.js.coffee
	app/models/user.rb
	app/views/help/index.html.haml
	doc/install/installation.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/api/api.rb
	lib/api/entities.rb
	lib/gitlab/ldap/user.rb
	lib/tasks/gitlab/check.rake

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

2013-11-29 10:01:43 +02:00

..

blame

Add titles for blame view and Edit mode

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

blob

Remove file from repository feature

2013-11-19 16:14:56 +02:00

branches

Fix recent branches order. Added counters

2013-11-15 09:18:06 +02:00

commit

Prevent 500 error if cant detect branches for commit

2013-10-23 19:29:29 +03:00

commits

Small css cleanup

2013-11-14 17:23:31 +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

Reduce usage of bold font

2013-10-21 10:32:05 +03:00

merge_requests

Merge pull request #5557 from dpursehouse/merge-status-message-improvement

2013-11-15 03:55:18 -08: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

new_tree

Move part of file creation logic into separate context

2013-11-05 12:06:52 +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

Nicer icons for enabled/disabled stuff

2013-11-20 14:05:42 +02: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

Hide new file link if not branch HEAD

2013-11-05 12:23:11 +02:00

walls

Move projects controllers/views in Projects module

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

wikis

Update git-clone js. Use new style on wiki git access too

2013-10-21 13:07:16 +03:00

_dropdown.html.haml

Improve UX for project home page

2013-11-12 12:56:20 +02: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

Extend Gitlab#default_regex. Dont allow project path ends with .git

2013-11-13 16:13:40 +02:00

empty.html.haml

Render right clone panel partial on empty project page

2013-10-21 13:47:23 +03:00

fork.html.haml

Fix grammar in fork error message.

2013-11-21 11:53:48 -08:00

new.html.haml

Merge pull request #5359 from dpursehouse/update-some-labels

2013-10-21 07:45:09 -07:00

show.html.haml

Improve UX for project home page

2013-11-12 12:56:20 +02: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