Marin Jankovski 3e875b05b4 Merge remote-tracking branch 'ce/master' into merge_ce ...

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/project_new.js.coffee
	app/controllers/projects_controller.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/project_team.rb
	app/models/user.rb
	app/services/files/create_service.rb
	app/views/layouts/nav/_admin.html.haml
	config/routes.rb
	db/schema.rb
	spec/models/jira_service_spec.rb
	spec/requests/api/projects_spec.rb

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

..

blame

Replace highlight.js with rouge-fork rugments

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

Show branches/tags as labels on commit page

2015-01-22 11:15:21 -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

show diff in submodules

2015-01-19 17:18:08 +03: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

Disable 'check all issues' checkbox for unprivileged users.

2015-01-20 09:16:26 +02:00

labels

Possibility to create Milestones or Labels when Issues are disabled

2014-11-20 18:18:16 +02:00

merge_requests

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

2015-01-29 11:34:43 -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

Only count the user's last vote

2015-01-19 21:18:36 +00: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-01-29 11:34:43 -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

Show modal window with instructions if GH OAuth is not enables

2015-01-22 11:48:20 -08:00

_home_panel.html.haml

Redesign way how project avatar displayed on project page

2015-01-26 00:23:16 -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-01-29 11:34:43 -08:00

empty.html.haml

Replace p with h4 for empty repo text

2015-01-27 11:32:28 -08:00

new.html.haml

Show modal window with instructions if GH OAuth is not enables

2015-01-22 11:48:20 -08:00

no_repo.html.haml

Separate web page for projects without repository

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

show.html.haml

Disable turbolink on links pointing out to ci services

2015-01-20 12:19:16 +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