Dmitriy Zaporozhets b165b097f5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee ...

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

Conflicts:
	LICENSE
	VERSION
	app/controllers/omniauth_callbacks_controller.rb
	app/helpers/application_helper.rb
	app/helpers/merge_requests_helper.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_team.rb
	app/views/admin/groups/edit.html.haml
	app/views/groups/_projects.html.haml
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/integration/README.md
	lib/gitlab/git_access.rb
	lib/gitlab/markdown.rb
	spec/helpers/merge_requests_helper.rb
	spec/models/merge_request_spec.rb

2014-06-17 10:53:44 +03:00

..

blame

Add titles for blame view and Edit mode

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

blob

Fix blob breadcrumb

2014-06-14 20:01:56 +03:00

branches

Changed some stuff around after rebase

2014-05-23 20:26:31 +02:00

commit

Fix commit comment count css

2014-03-14 23:09:43 +02:00

commits

Update gitlab-grit to newer version with normal diff collection. Show if file mode was changed

2014-06-14 22:54:56 +03:00

compare

Replace ui-box title with panel-heading

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

deploy_keys

Replace existing links to help pages with the new ones.

2014-05-29 08:58:15 +02:00

edit_tree

Improve edit page UI/UX

2014-05-22 12:25:44 +03:00

git_hooks

Add a link to the Ruby Regexp documentation

2014-03-26 17:26:28 +01:00

graphs

Replace gif animation with font icon spinner

2014-02-05 20:30:57 +02:00

group_links

EE ui fixes after twbs3

2014-01-27 14:40:01 +02:00

hooks

Replace ui-box title with panel-heading

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

issues

move all sidebars to one side for improved UX; add button in head of projects/issues and milestones instead of tab on side of screen to prevent overlapping of content

2014-06-14 22:44:23 +02:00

labels

Refactor scss

2014-02-20 13:51:22 +02:00

merge_requests

Merge branch 'responsive-sidebar' into 'master'

2014-06-15 06:02:12 +00:00

milestones

Show/hide issue assignee avatar depends on drag-n-drop column in milestone view

2014-06-16 12:17:34 +03:00

network

Improve network UI

2014-06-14 19:35:45 +03:00

new_tree

Commit message textareas have 72 char mark line.

2014-04-16 21:55:36 +02:00

notes

Revert "Implements and refactors clipboard feature for markdown."

2014-06-03 10:56:40 +03:00

protected_branches

Replace existing links to help pages with the new ones.

2014-05-29 08:58:15 +02:00

refs

Load last commit for files per 10 items.

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

repositories

Prevent timeout for Commits#stats page for huge repos

2014-06-12 22:24:19 +03:00

services

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee

2014-06-17 10:53:44 +03:00

snippets

Refactor snippets views

2014-06-14 12:36:46 +03:00

tags

Restyle git tags page

2014-06-12 22:08:54 +03:00

team_members

Replace ui-box title with panel-heading

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

tree

Improve tree view for iPad

2014-06-14 19:09:36 +03:00

wikis

Revert "Implements and refactors clipboard feature for markdown."

2014-06-03 10:56:40 +03:00

_dropdown.html.haml

Improve UX for project home page

2013-11-12 12:56:20 +02:00

_errors.html.haml

alert-error to alert-danger

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

_home_panel.html.haml

Small UI fix

2014-06-16 14:26:38 +03:00

_settings_nav.html.haml

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee

2014-06-17 10:53:44 +03:00

_visibility_level.html.haml

Use the correct links, replace in search.

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

create.js.haml

Project import and retry import scaffold

2014-03-12 19:25:48 +02:00

edit.html.haml

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee

2014-06-17 10:53:44 +03:00

empty.html.haml

Project import and retry import scaffold

2014-03-12 19:25:48 +02:00

fork.html.haml

alert-error to alert-danger

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

import.html.haml

Hide retry import form for non masters

2014-03-13 10:27:20 +02:00

new.html.haml

Improve import notice

2014-03-12 10:25:37 +02:00

show.html.haml

Hide group dashboard and project sidebar for xs size

2014-05-15 16:30:50 +03:00

transfer.js.haml

Use TransferContext for project

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

update.js.haml

Include tw bootstrap manually. Fix hide class

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