Dmitriy Zaporozhets 0c5a9f20b5 Merge branch '6-1-stable' of https://dev.gitlab.org/gitlab/gitlabhq into 6-1-stable-ee ...

Conflicts:
	VERSION
	app/controllers/application_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/models/merge_request.rb
	app/models/user.rb
	app/views/groups/_projects.html.haml
	config/routes.rb
	db/schema.rb
	doc/install/installation.md

2013-09-27 15:24:54 +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

Compare link for branches

2013-09-12 21:39:53 +03:00

commit

Improve Commit#show page UI

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

commits

Add default values to compare page link

2013-09-12 21:46:31 +03: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

ProjectGroupLink access level

2013-08-20 13:59:43 +03:00

hooks

Lots of wording improvements for the project settings area

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

issues

Compare page improved

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

labels

remove unnecessary %br and title

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

merge_requests

Improve Merge Request form

2013-09-09 17:11:58 +03:00

milestones

[#4821] - Fix some missing iids

2013-08-26 14:54:07 +02:00

network

A little improvement

2013-08-21 19:20:29 +09: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

Lots of wording improvements for the project settings area

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

snippets

Minor UI improvements

2013-08-12 12:08:52 +03:00

tags

Fix new-tag-btn align

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

team_members

Remove team mentions

2013-08-27 12:59:44 +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

Fixed wrong last-edit time for wiki

2013-08-16 16:59:26 +03:00

_clone_panel.html.haml

Add links to create branch/tag from project home page

2013-08-27 13:20:36 +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

Lots of wording improvements for the project settings area

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

empty.html.haml

Replace remote url on selection.

2013-09-13 10:12:42 +02:00

fork.html.haml

Error page if forking fails

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

new.html.haml

Use ruby 1.9 hash syntax

2013-09-14 13:28:15 +02:00

show.html.haml

Add event filter for group and project show pages

2013-08-26 16:30:03 +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