Kamil Trzcinski ed3f267497 Merge branch 'ci-commit-as-pipeline' into with-pipeline-view ...

* ci-commit-as-pipeline: (131 commits)
  Optimise Merge Request builds rendering
  Fix migrations on MySQL
  Update db/schema.rb
  Cleanup changes
  Cleanup required migrations
  Add indexes concurrently on PostgreSQL
  Fix CiStatus implementation and tests
  Fix group_member_spec to not leak information
  Fix doc for moving an issue
  Update tests for moving issues via API
  Tie example config to JIRA screenshot
  API: Ability to move an issue
  Added ability to add custom tags to transactions
  API: Avoid group leak while updating the group
  API: Return 404 if user does not have access to group
  Move 'New branch from issue' feature doc to web_editor.md
  Fix repository cache invalidation issue when project is recreated with an empty repo
  improve formatting
  Add `Gitlab.com?` method
  (doc) fix typo to ssh keys doc url
  ...

Conflicts:
	app/controllers/projects/pipelines_controller.rb
	app/helpers/ci_status_helper.rb
	app/helpers/gitlab_routing_helper.rb
	app/views/projects/ci/commits/_commit.html.haml
	app/views/projects/commit/_ci_commit.html.haml

2016-04-13 16:38:24 +02:00

..

application_controller.rb

Return status code 303 after a branch DELETE operation to avoid project deletion

2016-04-06 21:11:10 -07:00

artifacts_controller.rb

Make the CI permission model simpler

2016-02-02 09:18:08 +01:00

avatars_controller.rb

Tweaks, refactoring, and specs

2016-03-20 21:04:07 +01:00

badges_controller.rb

Use default branch when displaying list of badges

2016-04-06 19:56:35 +02:00

blame_controller.rb

Move blame group logic to dedicated class

2016-01-28 14:49:21 +01:00

blob_controller.rb

Add a Blob model that wraps Gitlab::Git::Blob

2016-02-18 22:45:30 -05:00

branches_controller.rb

Return status code 303 after a branch DELETE operation to avoid project deletion

2016-04-06 21:11:10 -07:00

builds_controller.rb

Move build erasable implementation from concern to model

2016-02-19 17:24:59 +01:00

commit_controller.rb

Fix specs

2016-04-11 23:32:55 +02:00

commits_controller.rb

Replaces "Create merge request" link with one to the MR when one exists

2016-02-10 10:32:25 -02:00

compare_controller.rb

Use Gitlab::Git::DiffCollections

2016-03-03 18:38:44 +01:00

deploy_keys_controller.rb

Redirect to a default path if HTTP_REFERER is not set

2015-10-20 07:45:48 -07:00

find_file_controller.rb

Merge branch 'master' of github.com:gitlabhq/gitlabhq

2016-01-07 12:56:18 +01:00

forks_controller.rb

Use the configured Kaminari "per page" default

2016-03-19 17:37:54 -04:00

graphs_controller.rb

Migrate CI::Project to Project

2015-12-11 18:02:09 +01:00

group_links_controller.rb

Add functionality to setup share of project with group via project settings

2016-03-11 18:37:46 +01:00

hooks_controller.rb

Migrate CI::Services and CI::WebHooks to Services and WebHooks

2015-12-10 16:04:08 +01:00

imports_controller.rb

ContinueToParams -> ContinueParams

2016-03-13 13:13:19 +01:00

issues_controller.rb

Edit button leaves modal open

2016-03-25 09:54:05 -04:00

labels_controller.rb

Use the configured Kaminari "per page" default

2016-03-19 17:37:54 -04:00

merge_requests_controller.rb

Optimise Merge Request builds rendering

2016-04-13 16:32:42 +02:00

milestones_controller.rb

Standardised the output of the JSON to always include the name

2016-03-29 11:59:13 +01:00

network_controller.rb

Fix network graph when branch name has single quotes

2015-07-29 23:29:47 -07:00

notes_controller.rb

Fix code review issues

2016-04-12 14:24:05 +02:00

notification_settings_controller.rb

Simplify Projects::NotificationSettingsController

2016-04-12 12:10:58 -03:00

pipelines_controller.rb

Cleanup changes

2016-04-13 15:58:22 +02:00

project_members_controller.rb

Respond 404 when unauthorized user imports members

2016-04-05 14:37:06 +02:00

protected_branches_controller.rb

Fixed Rubocop offenses

2015-12-15 00:53:52 -02:00

raw_controller.rb

Refactor caching code

2016-03-07 14:27:53 +01:00

refs_controller.rb

Make it possible to switch ref in badges view

2016-04-06 19:56:34 +02:00

releases_controller.rb

Refactor release code a bit

2015-11-09 15:30:50 +01:00

repositories_controller.rb

Move RepositoryArchiveCacheWorker to sidekiq-cron

2016-04-12 11:12:05 -04:00

runner_projects_controller.rb

Make the CI permission model simpler

2016-02-02 09:18:08 +01:00

runners_controller.rb

Make the CI permission model simpler

2016-02-02 09:18:08 +01:00

services_controller.rb

Backport JIRA service

2015-12-18 14:19:48 -06:00

snippets_controller.rb

Ensure project snippets have their own access level

2016-03-25 18:51:17 +01:00

tags_controller.rb

Use the configured Kaminari "per page" default

2016-03-19 17:37:54 -04:00

tree_controller.rb

Fix specs and behavior for LFS files

2015-12-18 16:14:12 +01:00

triggers_controller.rb

Make the CI permission model simpler

2016-02-02 09:18:08 +01:00

uploads_controller.rb

Address feedback

2016-03-22 00:09:20 +01:00

variables_controller.rb

Make the CI permission model simpler

2016-02-02 09:18:08 +01:00

wikis_controller.rb

Add specific markdown_preview route for Wikis

2016-03-30 15:04:58 -03:00