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

..

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

Rubocop: Style/AlignHash enabled

2015-02-02 21:15:44 -08:00

branches_controller.rb

Sanitize branch name and ref name

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

commit_controller.rb

Commit page: async load branches info

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

commits_controller.rb

Apply default scope to labels and remove one for notes

2015-02-05 20:29:41 -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 rubocop issues

2015-02-04 18:26:41 -08: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

Apply default scope to labels and remove one for notes

2015-02-05 20:29:41 -08:00

merge_requests_controller.rb

Apply default scope to labels and remove one for notes

2015-02-05 20:29:41 -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

Rubocop: no trailing newlines

2015-02-02 21:53:27 -08:00

refs_controller.rb

Rubocop: Style/ElseAlignment enabled

2015-02-02 21:38:50 -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

Try to test settings added in the service.

2015-02-12 13:02:58 -08:00

snippets_controller.rb

Sanitize snippet file name in raw headers

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

tags_controller.rb

Move all event creation to EventCreateService.

2015-02-13 12:02:58 +01: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

Rubocop: indentation fixes Yay!!!

2015-02-02 21:59:28 -08:00