Robert SpeicherandRobert Speicher ff1e0ecfc6 Merge branch 'mr-merge-base' into 'master' ...

Correctly determine MR diff base when MR has merge conflicts

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12779

See merge request !2632

2016-01-31 19:26:59 -05:00

..

application_controller.rb

Migrate CI::Project to Project

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

artifacts_controller.rb

Fix nonexistent method in artifacts controller

2016-01-15 13:48:29 +01:00

avatars_controller.rb

Only render 404 page from /public

2015-10-13 20:12:34 +03:00

blame_controller.rb

Merge branch 'highlight-blame' into 'master'

2016-01-31 19:26:59 -05:00

blob_controller.rb

Merge branch 'unescaped-diffs' into 'master'

2016-01-21 17:37:49 -08:00

branches_controller.rb

Merge branch 'master' into diverging-branch-graphs

2015-12-03 21:53:06 -06:00

builds_controller.rb

Give reporters the ability to download artifacts.

2016-01-15 12:01:19 +01:00

commit_controller.rb

Merge branch 'issue_3945' into 'master'

2016-01-20 16:56:13 -05:00

commits_controller.rb

Add support for ref and path to commits filtering

2016-01-07 15:16:11 +01:00

compare_controller.rb

Merge branch 'mr-merge-base' into 'master'

2016-01-31 19:26:59 -05: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

Add tests for new functionality

2015-12-21 11:57:51 +01:00

graphs_controller.rb

Migrate CI::Project to Project

2015-12-11 18:02:09 +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

Merge branch 'fix-import-redirect-loop' into 'master'

2016-01-25 17:05:49 -08:00

issues_controller.rb

Merge branch 'fix-autocomplete-new-issues' into 'master'

2016-01-15 15:59:48 -05:00

labels_controller.rb

Fix 403 Access Denied error messages when accessing Labels section in a project that has MRs disabled but issues enabled

2015-06-18 03:15:05 -07:00

merge_requests_controller.rb

Merge branch 'issue_3945' into 'master'

2016-01-20 16:56:13 -05:00

milestones_controller.rb

Improve performance of sorting milestone issues

2015-10-19 11:37:14 +02:00

network_controller.rb

Fix network graph when branch name has single quotes

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

notes_controller.rb

base implementation of emoji picker [ci skip]

2015-12-22 23:12:23 +02:00

project_members_controller.rb

Fix only 20 group members showing on project member page

2015-12-09 01:43:57 +01:00

protected_branches_controller.rb

Fixed Rubocop offenses

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

raw_controller.rb

Add specs for showing lfs object in UI.

2015-12-07 15:03:50 +01:00

refs_controller.rb

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

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

releases_controller.rb

Refactor release code a bit

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

repositories_controller.rb

Let gitlab-git-http-server handle archive downloads

2015-10-08 17:12:00 +02:00

runner_projects_controller.rb

Remove ci_ prefix from all ci related things

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

runners_controller.rb

Remove ci_ prefix from all ci related things

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

services_controller.rb

Backport JIRA service

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

snippets_controller.rb

Merge branch 'fix-autocomplete-new-issues' into 'master'

2016-01-15 15:59:48 -05:00

tags_controller.rb

Add authorization to new branch/tag pages.

2015-12-03 18:53:17 +01:00

tree_controller.rb

Fix specs and behavior for LFS files

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

triggers_controller.rb

Remove ci_ prefix from all ci related things

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

uploads_controller.rb

Only render 404 page from /public

2015-10-13 20:12:34 +03:00

variables_controller.rb

Remove ci_ prefix from all ci related things

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

wikis_controller.rb

Fix rubocop warnings in app

2015-10-03 00:56:37 -05:00