Dmitriy Zaporozhets b03b69e23e Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-1 ...

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

Conflicts:
	app/assets/images/brand_logo.png
	app/assets/stylesheets/sections/login.scss
	app/controllers/projects/merge_requests_controller.rb
	app/helpers/appearances_helper.rb
	app/views/layouts/devise.html.haml

2014-07-16 12:39:45 +03:00

..

blame

Add titles for blame view and Edit mode

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

blob

Merge pull request #7169 from cirosantilli/remove-center-elem

2014-06-24 10:28:06 +03:00

branches

Changed some stuff around after rebase

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

commit

Refactor diff suppress logic and diff views

2014-07-15 18:28:21 +03:00

commits

Refactor diff suppress logic and diff views

2014-07-15 18:28:21 +03:00

compare

Refactor diff suppress logic and diff views

2014-07-15 18:28: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

Don't remove trailing newline when editing a file in web UI editor:

2014-06-27 10:50:36 -07:00

git_hooks

No need for bold font in message.

2014-07-07 11:58:29 +02:00

graphs

Replace HTML5 obsolete center element with CSS.

2014-06-21 09:43:00 +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

issues

Show counters in sidebar filter in same way like we did for projects page

2014-07-10 17:54:31 +03:00

labels

Refactor scss

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

merge_requests

Refactor diff suppress logic and diff views

2014-07-15 18:28:21 +03:00

milestones

Better UI for closed/reopen buttons

2014-07-02 20:05:36 +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

Fix diff comments toggle button

2014-06-25 11:40:33 +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

Add trailing newline to all text files.

2014-06-21 11:20:22 +02: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

Merge pull request #7177 from Totof6942/master

2014-06-24 10:26:48 +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

Add html_escape to project description. auto_link set description to html_safe but! dont escape html :(.

2014-07-11 00:07:20 +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-changes

2014-06-26 13:02:08 +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

Replace HTML5 obsolete center element with CSS.

2014-06-21 09:43:00 +02:00

new.html.haml

Replace HTML5 obsolete center element with CSS.

2014-06-21 09:43:00 +02:00

show.html.haml

Show VERSION information on project sidebar

2014-06-25 12:07:06 +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