gitlab-org--gitlab-foss/lib/gitlab
Robert Speicher bcc504d3c3 Merge branch 'dm-no-conflicts-when-branches-are-missing' into 'master'
Stop MR conflict code from blowing up when branches are missing

Closes #32544

See merge request !11501
2017-05-18 22:13:20 +00:00
..
auth Remove unecessary defaults for uniq ip block, cleanup refactoring leftovers 2017-03-06 15:45:43 +01:00
badge
bitbucket_import [BB Importer] Save the error trace and the whole raw document 2017-04-11 19:27:15 +03:00
cache/ci Load a project's CI status in batch from redis 2017-04-26 12:04:22 +00:00
chat_commands Enable the Style/TrailingCommaInLiteral cop 2017-05-10 18:25:45 +02:00
checks Add confirm delete protected branch modal 2017-05-08 07:41:58 +00:00
ci Merge branch 'allow_numeric_values_in_gitlab_ci_yml' into 'master' 2017-05-15 07:59:45 +00:00
conflict Fix conflict resolution from corrupted upstream 2017-05-12 20:47:51 +01:00
cycle_analytics Enable the Style/TrailingCommaInLiteral cop 2017-05-10 18:25:45 +02:00
data_builder Merge branch 'dturner/username' into 'master' 2017-05-15 07:28:58 +00:00
database Fixes for the rename reserved paths helpers 2017-05-18 20:08:32 +00:00
dependency_linker Select dependency linker based on file type 2017-05-12 19:09:30 -05:00
diff Stop MR conflict code from blowing up when branches are missing 2017-05-18 15:48:42 -05:00
downtime_check
email Fix email receiver metrics events 2017-05-05 10:37:54 +01:00
etag_caching Rename all references to rendered_title to realtime_changes 2017-05-13 21:23:58 +01:00
fogbugz_import Backport of multiple_assignees_feature [ci skip] 2017-05-04 17:11:53 +03:00
gfm
git Merge branch 'gitaly-local-branches' into 'master' 2017-05-18 14:22:41 +00:00
gitaly_client Merge branch 'gitaly-local-branches' into 'master' 2017-05-18 14:22:41 +00:00
github_import Backport of multiple_assignees_feature [ci skip] 2017-05-04 17:11:53 +03:00
gitlab_import
google_code_import Backport of multiple_assignees_feature [ci skip] 2017-05-04 17:11:53 +03:00
graphs
health_checks Add /-/readiness /-/liveness and /-/health_metrics endpoints to track application readiness 2017-04-07 10:27:15 +00:00
import_export Merge branch 'fix/gl-project-id' into 'master' 2017-05-08 06:52:01 +00:00
ldap Enable the Style/TrailingCommaInArguments cop 2017-05-10 18:25:45 +02:00
markdown
metrics
middleware Fix go-get support for projects in nested groups 2017-03-07 19:40:19 -06:00
o_auth Fix OAuth, LDAP and SAML SSO when regular sign-ups are disabled 2017-04-24 19:27:39 -07:00
prometheus/queries Avoid comma t the end of hash 2017-05-12 13:09:46 +02:00
request_profiler
saml
sanitizers
serializer Enable and autocorrect the CustomErrorClass cop 2017-03-01 15:28:10 +00:00
sherlock
sidekiq_middleware
sidekiq_status Periodically mark projects that are stuck in importing as failed 2017-04-05 16:11:51 +02:00
slash_commands Display slash commands outcome when previewing Markdown 2017-05-04 17:02:25 +02:00
sql
template Submodule Dockerfile templates 2017-04-26 15:57:44 +00:00
testing Introduce a new middleware for the test environment that can block requests 2017-03-22 19:45:21 +01:00
view/presenter
access.rb Enable the Style/TrailingCommaInLiteral cop 2017-05-10 18:25:45 +02:00
allowable.rb use a magic default :global symbol instead of nil 2017-03-09 11:49:52 -08:00
app_logger.rb
asciidoc.rb Merge branch 'bvl-security-9-1-markup-pipeline' 2017-05-10 16:44:20 +02:00
auth.rb Allow OAuth clients to push code 2017-04-13 13:13:22 +00:00
blame.rb
changes_list.rb
chat_name_token.rb
closing_issue_extractor.rb
color_schemes.rb
config_helper.rb
contributions_calendar.rb
contributor.rb
current_settings.rb
database.rb removes redundant code from database.rb 2017-04-11 20:20:19 +01:00
dependency_linker.rb Remove trailing comma in dependency linker to satisfy Rubocop 2017-05-12 14:01:54 -07:00
devise_failure.rb
downtime_check.rb
ee_compat_check.rb Fix invalid object reference in ee_compat_check script 2017-05-17 15:17:02 -04:00
emoji.rb Moved the title onto the emoji tag 2017-04-24 17:08:12 +01:00
environment_logger.rb
exclusive_lease.rb
file_detector.rb Add auxiliary blob viewers to dependency files 2017-05-17 14:10:00 -05:00
file_finder.rb Backport FileFinder from EE 2017-05-12 13:21:30 +03:00
git.rb Incorporate Gitaly client for refs service 2017-04-04 16:53:44 +02:00
git_access.rb Don't pass `env` anymore to GitAccess, ChangeAccess, and ForcePush 2017-04-10 16:10:18 +02:00
git_access_status.rb
git_access_wiki.rb
git_logger.rb
git_post_receive.rb Added repository_update hook 2017-05-12 23:26:48 +01:00
git_ref_validator.rb
gitaly_client.rb Don't reuse gRPC channels 2017-05-15 10:52:33 +02:00
gl_id.rb
gl_repository.rb Pass GL_REPOSITORY in Workhorse responses 2017-05-05 10:52:06 -03:00
gon_helper.rb Add current_user_avatar_url to gon 2017-05-18 09:40:35 +01:00
highlight.rb Autolink package names in Gemfile 2017-05-10 08:26:21 -05:00
i18n.rb Add CHANGELOG entry, some specs and locale file for German. 2017-05-04 18:44:19 -05:00
identifier.rb
import_export.rb Add Pipeline Schedules that supersedes experimental Trigger Schedule 2017-05-07 22:35:56 +00:00
import_formatter.rb
import_sources.rb
incoming_email.rb
issuable_sorter.rb Change issues sentence to use natural sorting 2017-04-25 18:57:08 -05:00
issues_labels.rb
job_waiter.rb
key_fingerprint.rb
kubernetes.rb Enable the Style/TrailingCommaInLiteral cop 2017-05-10 18:25:45 +02:00
lazy.rb
lfs_token.rb
logger.rb
mail_room.rb
markup_helper.rb Use constants in Gitlab::MarkupHelper 2017-04-20 00:39:29 +00:00
metrics.rb Allow GitLab instance to start when InfluxDB hostname cannot be resolved 2017-05-13 18:03:25 +03:00
optimistic_locking.rb
other_markup.rb Merge branch 'bvl-security-9-1-markup-pipeline' 2017-05-10 16:44:20 +02:00
pages_transfer.rb
polling_interval.rb Convert value to string before setting Poll-Interval header 2017-04-05 15:35:05 +02:00
popen.rb
project_search_results.rb Backport FileFinder from EE 2017-05-12 13:21:30 +03:00
project_transfer.rb
prometheus_client.rb Custom queries for prometheus 2017-05-11 23:07:12 +02:00
protocol_access.rb
recaptcha.rb
redis.rb Fix config/mail_room.yml to be interpretable Ruby 2017-03-15 16:21:55 -06:00
reference_extractor.rb
regex.rb Reuse Gitlab::Regex.full_namespace_regex in the DynamicPathValidator 2017-05-02 09:13:41 +02:00
repo_path.rb Generate and handle a gl_repository param to pass around components 2017-05-03 17:37:30 -03:00
repository_check_logger.rb
request_context.rb Remove unecessary defaults for uniq ip block, cleanup refactoring leftovers 2017-03-06 15:45:43 +01:00
request_profiler.rb
route_map.rb Enable and autocorrect the CustomErrorClass cop 2017-03-01 15:28:10 +00:00
routing.rb
search_results.rb Fix blob highlighting in search 2017-04-03 18:51:44 +01:00
seeder.rb Fix the `Gitlab::Seeder` monkey patch to disable mail delivery 2017-03-02 20:29:30 -05:00
sentry.rb Enable the Style/TrailingCommaInArguments cop 2017-05-10 18:25:45 +02:00
shell.rb Add configurable timeout for git fetch and clone operations 2017-04-27 10:51:35 +10:00
shell_adapter.rb
sherlock.rb
sidekiq_logger.rb
sidekiq_status.rb Periodically mark projects that are stuck in importing as failed 2017-04-05 16:11:51 +02:00
sidekiq_throttler.rb
snippet_search_results.rb
string_range_marker.rb Extract generic parts of Gitlab::Diff::InlineDiffMarker 2017-05-10 08:26:21 -05:00
string_regex_marker.rb Add Gitlab::StringRegexMarker 2017-05-10 08:26:21 -05:00
time_tracking_formatter.rb
timeless.rb
update_path_error.rb Enable and autocorrect the CustomErrorClass cop 2017-03-01 15:28:10 +00:00
upgrader.rb
uploads_transfer.rb Merge branch '29843-project-subgroup-transfer' into 'security' 2017-03-29 19:16:50 -07:00
url_blocker.rb Merge branch 'ssrf' into 'security' 2017-03-20 18:53:45 -07:00
url_builder.rb
url_sanitizer.rb Fix ProjectWiki#http_url_to_repo signature 2017-03-20 16:24:01 +01:00
usage_data.rb Remove Services count from usage ping payload. 2017-05-18 11:49:11 -05:00
user_access.rb Add confirm delete protected branch modal 2017-05-08 07:41:58 +00:00
user_activities.rb Add a new Gitlab::UserActivities class to track user activities 2017-04-14 15:20:55 +02:00
utils.rb
version_info.rb
visibility_level.rb Remove the User#is_admin? method 2017-04-09 13:20:57 +11:00
workhorse.rb Don't reuse gRPC channels 2017-05-15 10:52:33 +02:00