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

..

ci

Fix Error 500 when visiting build page of project with nil runners_token

2016-01-10 18:12:47 -08:00

concerns

Merge branch 'upvote_count_to_api' into 'master'

2015-12-29 16:07:12 +00:00

hooks

Accept 2xx status codes for successful Web hook triggers

2016-01-07 06:28:24 -08:00

members

Tag model specs

2015-12-09 10:50:51 +01:00

project_services

Suppress e-mails on failed builds if allow_failure is set

2016-01-07 10:45:39 -08:00

abuse_report_spec.rb

Block the reported user before destroying the record

2016-01-12 20:59:55 -05:00

application_setting_spec.rb

Merge branch 'sentry-integration' into 'master'

2016-01-20 14:01:23 -05:00

broadcast_message_spec.rb

Move BroadcastMessage#status to a helper since it's presentational

2016-01-13 11:49:59 -05:00

build_spec.rb

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

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

commit_range_spec.rb

Tag model specs

2015-12-09 10:50:51 +01:00

commit_spec.rb

Tag model specs

2015-12-09 10:50:51 +01:00

commit_status_spec.rb

Annotate models

2016-01-06 13:09:55 +00:00

deploy_key_spec.rb

Tag model specs

2015-12-09 10:50:51 +01:00

deploy_keys_project_spec.rb

Tag model specs

2015-12-09 10:50:51 +01:00

event_spec.rb

Tag model specs

2015-12-09 10:50:51 +01:00

external_issue_spec.rb

Tag model specs

2015-12-09 10:50:51 +01:00

external_wiki_service_spec.rb

Annotate models

2016-01-06 13:09:55 +00:00

forked_project_link_spec.rb

Fix Style/TrailingBlankLines cop violations

2015-06-22 14:38:33 -04:00

generic_commit_status_spec.rb

Annotate models

2016-01-06 13:09:55 +00:00

global_milestone_spec.rb

Fix Error 500 when global milestones have slashes

2015-12-22 13:15:32 -08:00

group_spec.rb

Annotate models

2016-01-06 13:09:55 +00:00

identity_spec.rb

Codestyle changes

2016-01-12 12:29:10 -02:00

issue_spec.rb

Tag model specs

2015-12-09 10:50:51 +01:00

jira_issue_spec.rb

Backport JIRA service

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

key_spec.rb

Fixed Rubocop offenses

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

label_link_spec.rb

Tag model specs

2015-12-09 10:50:51 +01:00

label_spec.rb

Tag model specs

2015-12-09 10:50:51 +01:00

member_spec.rb

Tag model specs

2015-12-09 10:50:51 +01:00

merge_request_spec.rb

Annotate models

2016-01-06 13:09:55 +00:00

milestone_spec.rb

Tag model specs

2015-12-09 10:50:51 +01:00

namespace_spec.rb

Annotate models

2016-01-06 13:09:55 +00:00

note_spec.rb

Fix specs and rubocop warnings

2016-01-14 10:04:48 +01:00

project_security_spec.rb

Tag model specs

2015-12-09 10:50:51 +01:00

project_snippet_spec.rb

Tag model specs

2015-12-09 10:50:51 +01:00

project_spec.rb

Annotate models

2016-01-06 13:09:55 +00:00

project_team_spec.rb

Tag model specs

2015-12-09 10:50:51 +01:00

project_wiki_spec.rb

Add Banzai::Filter::GollumTagsFilter for parsing Gollum's tags in HTML

2016-01-14 12:09:31 -02:00

protected_branch_spec.rb

Tag model specs

2015-12-09 10:50:51 +01:00

release_spec.rb

Annotate models

2015-11-13 19:22:46 +01:00

repository_spec.rb

Merge branch 'update-gitlab-git' into 'master'

2016-01-26 11:48:14 -08:00

service_spec.rb

Annotate models

2016-01-06 13:09:55 +00:00

snippet_spec.rb

Tag model specs

2015-12-09 10:50:51 +01:00

user_spec.rb

Add ldap_blocked as new state to users state machine

2016-01-08 16:26:04 -02:00

wiki_page_spec.rb

Tag model specs

2015-12-09 10:50:51 +01:00