Dmitriy Zaporozhets fae2e540b6 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce-6-8 ...

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

Conflicts:
	CHANGELOG
	Gemfile.lock
	README.md
	VERSION
	app/assets/javascripts/application.js
	db/schema.rb
	doc/install/installation.md
	doc/update/4.2-to-5.0.md
	doc/update/5.0-to-5.1.md
	doc/update/5.1-to-5.2.md
	doc/update/5.2-to-5.3.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.0-to-6.7.md
	lib/gitlab/git_access.rb

2014-04-10 13:34:56 +03: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 pull request #6610 from Datacom/feature/parallel_diff_scrollbars_pr2

2014-03-27 08:20:25 +01:00

compare

Change Diff to Changes in views.

2014-03-26 14:00:12 +01:00

deploy_keys

Fix another instance of "created at"

2014-02-24 16:37:36 +09:00

edit_tree

Better redirect for edit blod from MergeRequest

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

Added tag_push_events to the web_hooks

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

issues

Add issue to an empty repo, test.

2014-04-08 17:12:57 +02:00

labels

Refactor scss

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

merge_requests

Restyle merge request accept and ci widget

2014-04-06 17:10:37 +03: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

Fix show/hide discussion link

2014-04-07 18:57:57 +03:00

protected_branches

Mention protected branch force push

2014-04-03 17:06:11 +03: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

Use normal btn size for test service

2014-04-06 14:26:24 +03: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

Rename wiki variables

2014-04-09 14:35:01 +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

Update clone panel to use input group.

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

_settings_nav.html.haml

GitHooks scaffold

2014-03-20 14:07:58 +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

Add proper explanation to MR in archived projects

2014-03-24 15:10:21 +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