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

..

application_controller.rb

Refactor issues and merge requests lists

2014-12-23 18:49:39 +02:00

avatars_controller.rb

adding avatar to project settings page added avatar removal show project avatar on dashboard, projects page, project page added rspec and feature tests added project avatar from repository new default project icon added added copying af avatar to forking of project added generated icon fixed avatar fork hound fix style fix test fix

2015-01-24 18:51:16 +01:00

blame_controller.rb

Explicitly set before_filter for ref-related controllers

2015-01-26 15:01:51 -08:00

blob_controller.rb

Fix blob controller rendering in case of errors

2015-01-26 15:12:13 -08:00

branches_controller.rb

Sanitize branch name and ref name

2014-11-13 16:20:43 +01:00

commit_controller.rb

Show tags in commit view

2015-01-17 19:22:35 +01:00

commits_controller.rb

Explicitly set before_filter for ref-related controllers

2015-01-26 15:01:51 -08:00

compare_controller.rb

remove auth duplication

2014-11-05 11:04:08 +02:00

deploy_keys_controller.rb

Use @project on controllers, don't call method

2014-10-19 23:36:23 +02:00

forks_controller.rb

Select namespace where to fork project

2014-11-13 22:06:19 +02:00

git_hooks_controller.rb

Ability to block commits with certain filenames

2014-11-03 18:22:43 +02:00

graphs_controller.rb

remove auth duplication

2014-11-05 11:04:08 +02:00

group_links_controller.rb

Fix tests for share project with group

2014-12-30 12:48:29 +02:00

hooks_controller.rb

Handle web hook exception

2014-12-04 15:07:01 +02:00

imports_controller.rb

Move projects import to separate resource. Add bare repo creation to repository controller

2014-11-30 00:50:25 +02:00

issues_controller.rb

Refactor issuable list pages

2014-12-24 11:04:33 +02:00

labels_controller.rb

Show labels help message if last label is deleted

2014-09-04 23:15:28 +02:00

merge_requests_controller.rb

developer can push to protected branches

2015-01-20 17:34:23 -08:00

milestones_controller.rb

Restyle and refactor milestones filter

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

network_controller.rb

Explicitly set before_filter for ref-related controllers

2015-01-26 15:01:51 -08:00

notes_controller.rb

Add Markdown preview to more forms

2014-10-15 23:52:33 -05:00

protected_branches_controller.rb

Use ruby 1.9 hash syntax

2015-01-23 17:41:10 -08:00

raw_controller.rb

Explicitly set before_filter for ref-related controllers

2015-01-26 15:01:51 -08:00

refs_controller.rb

Explicitly set before_filter for ref-related controllers

2015-01-26 15:01:51 -08:00

repositories_controller.rb

Move projects import to separate resource. Add bare repo creation to repository controller

2014-11-30 00:50:25 +02:00

services_controller.rb

Add a scope for visible services, code styling changes for easier readability.

2015-01-28 14:25:55 -08:00

snippets_controller.rb

Sanitize snippet file name in raw headers

2014-12-12 13:28:48 +02:00

tags_controller.rb

Refactor push data builder. Moved it to separate class

2015-01-11 23:51:31 -08:00

team_members_controller.rb

Add removal and addition of the user to the group membership to audit events.

2014-11-21 16:51:06 +01:00

tree_controller.rb

Explicitly set before_filter for ref-related controllers

2015-01-26 15:01:51 -08:00

wikis_controller.rb

Added ability to serve files in wiki repository

2014-06-07 11:14:33 +02:00