Marin Jankovski 7d9ef1124e Merge remote-tracking branch 'ce/master' into merge_ce ...

Conflicts:
	README.md
	app/assets/javascripts/project.js.coffee
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/service.rb
	app/models/user.rb
	app/services/git_push_service.rb
	config/initializers/1_settings.rb
	config/routes.rb
	db/schema.rb
	doc/integration/README.md
	doc/integration/external-issue-tracker.md
	doc/integration/github.md
	spec/controllers/import/github_controller_spec.rb
	spec/helpers/merge_requests_helper.rb
	spec/lib/gitlab/upgrader_spec.rb
	spec/models/note_spec.rb
	spec/requests/api/groups_spec.rb
	spec/services/git_push_service_spec.rb

2015-02-16 11:50:30 -08:00

..

blame

Fix "500: Encoding error" on blame view

2015-01-17 16:15:20 +02:00

blob

Fixed few tests and improved css style

2015-01-26 22:39:48 -08:00

branches

Corrected validation of 'Create branch' and 'Create tag' buttons

2014-12-23 16:04:39 +02:00

commit

Commit page: async load branches info

2015-02-03 09:10:56 -08:00

commits

Fix commits pagination

2015-01-17 14:54:54 -08: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

Better English in the performance diff message.

2015-02-14 12:13:31 -08:00

forks

Better wording

2015-01-28 15:37:20 -08: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 tests for share project with group

2014-12-30 12:48:29 +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

Adds link to milestone and keeping resource context on smaller

2015-02-03 11:41:32 -05:00

labels

Change label color text field type to "color"

2015-02-11 10:02:36 +00:00

merge_requests

Merge remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08:00

milestones

Restyle and refactor milestones filter

2015-01-06 12:32:04 -08:00

network

Upgrade to Font Awesome v4.2

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

notes

Also show colors in the sidebar of comment

2015-02-03 18:45:39 +01:00

protected_branches

Inline protected branches list

2014-12-29 19:30:27 +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 remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08:00

snippets

Upgrade to Font Awesome v4.2

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

tags

Corrected validation of 'Create branch' and 'Create tag' buttons

2014-12-23 16:04:39 +02:00

team_members

Merge remote-tracking branch 'ce/master' into merge_ce

2015-01-29 11:34:43 -08:00

tree

Refactor blob views

2015-01-26 15:03:30 -08:00

wikis

Replace highlight.js with rouge-fork rugments

2015-01-15 13:41:11 +01: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

_github_import_modal.html.haml

gitlab.com importer: refactorig

2015-02-05 17:03:43 -08:00

_gitlab_import_modal.html.haml

gitlab.com importer: refactorig

2015-02-05 17:03:43 -08:00

_home_panel.html.haml

Add project-avatar and group-avatar css classes

2015-02-07 11:38:58 -08:00

_issuable_form.html.haml

Fixed issue not being able to create a new issue on an empty project.

2014-12-30 18:53:46 +01:00

_issues_nav.html.haml

Remvoe unnecessary expand buttons

2015-01-15 23:34:30 -08:00

_md_preview.html.haml

Fix long line in view

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

_settings_nav.html.haml

Merge remote-tracking branch 'ce/master' into merge_ce

2015-01-29 11:34:43 -08:00

_visibility_level.html.haml

Use the correct links, replace in search.

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

_zen.html.haml

Fix tabindex for comment form

2015-01-15 10:34:40 -08:00

edit.html.haml

Merge remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08:00

empty.html.haml

Allow users that signed up via OAuth to set their password in order to use Git over HTTP(S).

2015-02-13 14:44:42 +01:00

new.html.haml

gitlab.com importer: refactorig

2015-02-05 17:03:43 -08:00

no_repo.html.haml

Separate web page for projects without repository

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

show.html.haml

Allow users that signed up via OAuth to set their password in order to use Git over HTTP(S).

2015-02-13 14:44:42 +01: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