Dmitriy Zaporozhets e502d785f9 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into code-from-ce-6-7 ...

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

Conflicts:
	CHANGELOG
	VERSION
	app/controllers/application_controller.rb
	app/models/user.rb
	app/views/groups/members.html.haml
	app/views/groups/show.html.haml
	config/gitlab.yml.example
	db/schema.rb
	features/steps/project/project_browse_branches.rb
	lib/api/projects.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/adapter.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/upgrader.rb

2014-03-18 11:15:01 +02:00

..

blame

Add titles for blame view and Edit mode

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

blob

Refactor scss

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

branches

Fixed 500 error on branch and tag creation via UI

2014-02-25 09:35:09 +02:00

commit

Fix commit comment count css

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

commits

Merge branch 'toggle_diff_comments' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-toggle_diff_comments

2014-03-13 23:11:16 +02:00

compare

Prevent 500 error on Compare page if diff read timout happens

2014-02-05 16:21:41 +02:00

deploy_keys

Refactor scss

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

edit_tree

Better redirect for edit blod from MergeRequest

2014-02-26 14:06:31 +02: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

Added tag_push_events to the web_hooks

2014-03-05 20:44:01 +01:00

issues

Issue box restyle

2014-02-27 21:04:44 +02:00

labels

Refactor scss

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

merge_requests

Refactor js behaviours helpers

2014-03-11 15:15:08 +02:00

milestones

Issue box restyle

2014-02-27 21:04:44 +02:00

network

Replace gif animation with font icon spinner

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

new_tree

Add base64 encoding selector to new file UI so you can add image to repo

2014-01-16 18:25:32 +02:00

notes

Merge branch 'toggle_diff_comments' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-toggle_diff_comments

2014-03-13 23:11:16 +02:00

protected_branches

Refactor scss

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

refs

Remove unnecessary ago keyword

2013-12-30 14:49:22 +02:00

repositories

Fix issue with robots constantly asking for projects archives

2014-02-17 11:26:33 +01:00

services

Fix compare view and services

2013-12-31 17:08:31 +02:00

snippets

Refactor scss

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

tags

Fix btn-group align

2014-02-24 17:44:25 +02:00

team_members

Use more specific class names: grouped -> btn-grouped

2014-02-20 13:05:33 +02:00

tree

Fixed readme page title

2014-03-05 11:23:21 -08:00

walls

Use more specific class names: grouped -> btn-grouped

2014-02-20 13:05:33 +02:00

wikis

Use more specific class names: grouped -> btn-grouped

2014-02-20 13:05:33 +02: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

Update clone panel to use input group.

2014-01-08 10:06:03 -06:00

_settings_nav.html.haml

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2014-02-11 10:15:13 +02:00

_visibility_level.html.haml

Fix new group form

2014-01-08 18:39:03 +02:00

create.js.haml

Project import and retry import scaffold

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

edit.html.haml

Refactor js behaviours helpers

2014-03-11 15:15:08 +02: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

Fix notification specs

2014-02-18 09:04:30 +02: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