Dmitriy Zaporozhets fd1f54b8ab Merge branch 'master' into ee-from-ce ...

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

Conflicts:
	Gemfile
	app/controllers/application_controller.rb
	app/views/admin/groups/_form.html.haml
	app/views/groups/edit.html.haml
	app/views/groups/show.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/projects/_settings_nav.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.6.md

2014-12-26 15:05:43 +02:00

..

blame

Use 8chars short sha for commit in views

2014-10-10 16:30:14 +03:00

blob

Merge pull request #7882 from cirosantilli/blob-instance-to-local

2014-12-20 20:19:59 +02:00

branches

Create helper for sort drowdown option names

2014-12-04 12:10:38 +02:00

commit

Use short_id instead of [0..N] for short version of commit sha

2014-10-10 15:39:48 +03:00

commits

Use 8chars short sha for commit in views

2014-10-10 16:30:14 +03:00

compare

Use button type=submit instead of input.

2014-10-01 11:12:56 +02:00

deploy_keys

Upgrade to Font Awesome v4.2

2014-10-03 12:19:24 +02:00

diffs

Set of UI changes mostly for issue and merge request

2014-12-25 14:32:49 +02:00

edit_tree

Make new and edit file submit more uniform

2014-10-08 10:01:07 +02:00

forks

Improve fork to namespaces feature

2014-11-14 16:06:39 +02:00

git_hooks

Improve git hook description

2014-11-17 13:52:34 +02:00

graphs

Upgrade to Font Awesome v4.2

2014-10-03 12:19:24 +02:00

group_links

Fix spelling mistake.

2014-06-27 11:32:26 +02:00

hooks

Replace ui-box title with panel-heading

2014-05-29 18:43:21 +03:00

imports

Move projects import to separate resource. Add bare repo creation to repository controller

2014-11-30 00:50:25 +02:00

issues

Improve issue/mr page for tablets

2014-12-25 14:46:18 +02:00

labels

Possibility to create Milestones or Labels when Issues are disabled

2014-11-20 18:18:16 +02:00

merge_requests

Merge branch 'master' into ee-from-ce

2014-12-26 15:05:43 +02:00

milestones

Merge branch 'master' into sidebar-nav

2014-12-21 01:20:51 +02:00

network

Upgrade to Font Awesome v4.2

2014-10-03 12:19:24 +02:00

new_tree

Move new blob commit message textarea below editor

2014-10-13 20:54:33 +02:00

notes

Remove extra css class markdown-area which prevented attachments upload.

2014-12-22 16:44:14 +01:00

protected_branches

Merge pull request #7915 from bbodenmiller/patch-12

2014-10-12 14:54:36 +02:00

refs

Load last commit for files per 10 items.

2014-06-12 12:01:54 +03:00

repositories

Fix fa-download icon

2014-10-04 16:58:59 +02:00

services

Merge CE master into EE master

2014-11-13 17:05:12 +02:00

snippets

Upgrade to Font Awesome v4.2

2014-10-03 12:19:24 +02:00

tags

Hide gpg signature on tags page from tag message

2014-11-18 18:00:38 +02:00

team_members

Limit to only additions and block at project team level.

2014-12-16 10:01:37 +01:00

tree

Use short_id instead of [0..N] for short version of commit sha

2014-10-10 15:39:48 +03:00

wikis

Use short_id instead of [0..N] for short version of commit sha

2014-10-10 15:39:48 +03:00

_commit_button.html.haml

Make new and edit file submit more uniform

2014-10-08 10:01:07 +02:00

_dropdown.html.haml

Upgrade to Font Awesome v4.2

2014-10-03 12:19:24 +02:00

_errors.html.haml

alert-error to alert-danger

2013-12-31 16:34:14 +02:00

_home_panel.html.haml

Fix header and project home ui for mobile

2014-11-19 18:11:16 +02:00

_issuable_form.html.haml

Merge branch 'upstream-master' into markdown-preview

2014-12-07 20:25:58 -07:00

_issues_nav.html.haml

Refactor issues and merge requests lists

2014-12-23 18:49:39 +02:00

_md_preview.html.haml

Fix long line in view

2014-10-18 18:16:20 -05:00

_settings_nav.html.haml

Merge branch 'master' into ee-from-ce

2014-12-26 15:05:43 +02:00

_visibility_level.html.haml

Use the correct links, replace in search.

2014-05-29 08:44:25 +02:00

_zen.html.haml

Factor zen mode.

2014-09-20 15:32:46 +02:00

edit.html.haml

Merge branch 'master' into ee-from-ce

2014-12-26 15:05:43 +02:00

empty.html.haml

cleanup empty repo page

2014-09-16 21:48:08 -07:00

new.html.haml

Set group path during creation

2014-12-22 13:50:58 +02:00

no_repo.html.haml

Separate web page for projects without repository

2014-11-30 00:49:51 +02:00

show.html.haml

Handle the case where the CI service may not provide a status_img_path method.

2014-10-08 17:22:41 +08:00

transfer.js.haml

transfer error handler

2014-12-15 16:10:56 +03:00

update.js.haml

Include tw bootstrap manually. Fix hide class

2014-01-01 21:42:42 +02:00