gitlab-org--gitlab-foss/lib/gitlab
Sean McGivern a0ae886135 Merge branch 'gitaly-merge-nil' into 'master'
Handle Gitaly aborted merge due to branch update

Closes gitaly#854

See merge request gitlab-org/gitlab-ce!16116
2018-01-04 11:01:02 +00:00
..
auth Renaming AuthenticationException to AuthenticationError 2017-11-17 13:33:21 +01:00
background_migration Merge branch 'change-issues-closed-at-background-migration' into 'master' 2018-01-04 10:14:06 +00:00
badge
bare_repository_import Fix Repository#processable? to allow .git repos in the root folder 2018-01-03 16:13:32 -02:00
bitbucket_import Fix bitbucket wiki import with hashed storage enabled 2017-11-20 16:14:41 +00:00
cache Use StrongMemoize and enable/disable cops properly 2017-11-18 01:01:53 +08:00
checks Disable redirect messages for anonymous clones 2017-12-25 05:33:32 -08:00
ci fix issue #37843 2018-01-03 20:57:41 +00:00
conflict Simplify conflict resolution interface and code 2018-01-02 16:22:02 -03:00
cycle_analytics Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules 2017-11-30 15:20:00 +08:00
data_builder
database Use a background migration for issues.closed_at 2018-01-03 12:28:00 +01:00
dependency_linker
diff Improve performance of DiffDiscussion#truncated_diff_lines and DiffNote#diff_line by removing expensive diff position calculation and comparison 2017-12-22 18:07:15 +01:00
downtime_check
email Use message body for merge request description 2017-12-11 11:46:21 +01:00
etag_caching
fogbugz_import Adds Rubocop rule for line break after guard clause 2017-11-16 17:58:29 +01:00
gfm
git Merge branch 'feature/add-max-count-to-count-commits-rpc' into 'master' 2018-01-04 10:58:47 +00:00
gitaly_client Merge branch 'gitaly-merge-nil' into 'master' 2018-01-04 11:01:02 +00:00
github_import Migrate to Project#empty_repo? 2017-12-20 19:13:11 +01:00
gitlab_import Adds Rubocop rule for line break after guard clause 2017-11-16 17:58:29 +01:00
google_code_import
gpg
grape_logging/formatters
graphs
health_checks
hook_data Add total_time_spent to the changes hash in issuable Webhook payloads 2017-11-15 15:42:19 +01:00
i18n
import_export Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules 2017-11-30 15:20:00 +08:00
kubernetes Fix namespace ambiguity with Kubernetes Pod definitions 2017-12-24 13:43:46 -08:00
ldap Make sure user email is read only when synced with LDAP 2017-12-15 12:48:48 +01:00
legacy_github_import Rename fetch_refs to refmap 2017-11-23 16:59:58 +01:00
metrics Use Concurrent::AtomicReference instead AtomicFixnum 2017-12-26 17:23:12 -02:00
middleware Revert "check for read_only? first before seeing if request is disallowed" 2017-11-21 15:35:30 +01:00
o_auth Make sure user email is read only when synced with LDAP 2017-12-15 12:48:48 +01:00
performance_bar
project_authorizations
prometheus Replce kubernetes_service and deployment_service to deployment_platform 2017-11-28 20:47:59 +09:00
quick_actions
redis
request_profiler
saml Adds Rubocop rule for line break after guard clause 2017-11-16 17:58:29 +01:00
sanitizers
serializer
sherlock
sidekiq_middleware
sidekiq_status
sidekiq_versioning Use a dedicated queue for each worker 2017-12-12 17:36:20 +01:00
slash_commands Use StrongMemoize and enable/disable cops properly 2017-11-18 01:01:53 +08:00
sql Use fuzzy search with minimum length of 3 characters where appropriate 2017-11-27 11:29:40 +01:00
storage_check Move the circuitbreaker check out in a separate process 2017-12-08 09:11:39 +01:00
template Adds Rubocop rule for line break after guard clause 2017-11-16 17:58:29 +01:00
testing
utils Use memoization for commits on diffs 2017-12-12 16:28:26 +01:00
view/presenter Present member collection at the controller level 2017-12-12 18:14:58 +01:00
access.rb Clarify wording of protected branch settings for the default branch 2017-11-20 16:09:56 +00:00
action_rate_limiter.rb Address review comments with playing pipeline scheduler 2017-12-12 17:12:45 -08:00
allowable.rb
app_logger.rb
asciidoc.rb
auth.rb Merge branch 'dm-fix-registry-with-sudo-token' into 'master' 2017-11-24 09:09:38 +00:00
background_migration.rb
blame.rb
changes_list.rb Adds Rubocop rule for line break after guard clause 2017-11-16 17:58:29 +01:00
chat_name_token.rb
ci_access.rb
closing_issue_extractor.rb
color_schemes.rb
config_helper.rb
contributions_calendar.rb
contributor.rb
current_settings.rb Move ModuleWithInstanceVariables to Gitlab namespace 2017-11-22 17:06:57 +08:00
daemon.rb Adds Rubocop rule for line break after guard clause 2017-11-16 17:58:29 +01:00
database.rb Merge branch 'mk-add-old-attachments-to-uploads-table' into 'master' 2017-12-07 02:34:58 +00:00
dependency_linker.rb
downtime_check.rb
ee_compat_check.rb Move the "Limit conflicts with EE" doc to "Automatic CE-> EE merge" 2017-12-05 17:49:49 +01:00
emoji.rb
encoding_helper.rb Move encoding methods to the more general EncodingHelper 2017-12-28 12:32:33 -03:00
environment.rb
environment_logger.rb
exclusive_lease.rb
fake_application_settings.rb
file_detector.rb
file_finder.rb
git.rb add support for the commit reference filter 2017-12-07 09:01:37 -05:00
git_access.rb Allow git pull/push on project redirects 2017-12-08 17:42:43 +00:00
git_access_wiki.rb refactor code to match EE changes 2017-12-07 17:13:40 +01:00
git_logger.rb
git_post_receive.rb
git_ref_validator.rb
gitaly_client.rb Move encoding methods to the more general EncodingHelper 2017-12-28 12:32:33 -03:00
github_import.rb Rename fetch_refs to refmap 2017-11-23 16:59:58 +01:00
gl_id.rb
gl_repository.rb
gon_helper.rb Multi File Editor File icons 2018-01-03 10:08:14 +00:00
gpg.rb
group_hierarchy.rb
highlight.rb
i18n.rb
identifier.rb Allow git pull/push on project redirects 2017-12-08 17:42:43 +00:00
import_export.rb Remove serialised diff and commit columns 2017-11-28 16:13:40 +00:00
import_formatter.rb
import_sources.rb add note to import sources 2018-01-03 09:31:32 +01:00
incoming_email.rb
issuable_metadata.rb Fail when issuable_meta_data is called on an unlimited collection 2017-11-07 16:26:55 +00:00
issuable_sorter.rb
issuables_count_for_state.rb
issues_labels.rb
job_waiter.rb Rewrite the GitHub importer from scratch 2017-11-07 23:24:59 +01:00
kubernetes.rb
lazy.rb
lfs_token.rb Fix Error 500 when pushing LFS objects with a write deploy key 2017-11-08 16:21:39 +00:00
logger.rb
mail_room.rb
markup_helper.rb
metrics.rb
multi_collection_paginator.rb Remove the selects when counting the last page 2017-11-17 16:20:47 +01:00
optimistic_locking.rb Adds Rubocop rule for line break after guard clause 2017-11-16 17:58:29 +01:00
other_markup.rb
otp_key_rotator.rb
pages.rb
pages_transfer.rb
path_regex.rb Speed up Unicorn specs by using a dummy Rack application instead of GitLab 2017-11-22 19:51:57 +00:00
performance_bar.rb
polling_interval.rb
popen.rb
project_search_results.rb fix for special charecter in file names 2017-11-30 09:57:58 +00:00
project_template.rb
project_transfer.rb
prometheus_client.rb
protocol_access.rb
recaptcha.rb
reference_counter.rb
reference_extractor.rb Refactor banzai to support referencing from group context 2017-12-06 19:16:22 +01:00
regex.rb Update container repository path reference 2017-11-16 09:31:07 +01:00
repo_path.rb
repository_check_logger.rb
request_context.rb
request_forgery_protection.rb
request_profiler.rb
route_map.rb
routing.rb Don't add a trailing slash in group redirects 2017-11-16 17:13:40 +00:00
search_results.rb Skip projects filter on issues search 2018-01-02 12:07:26 +01:00
seeder.rb Fix rake db:seed_fu not doing anything in CI 2018-01-02 12:44:51 -08:00
sentry.rb
shell.rb Import gitlab_projects.rb from gitlab-shell 2017-12-14 16:00:04 +00:00
shell_adapter.rb Memoize GitlabShellAdapter for performance and ease of testing 2017-11-20 23:28:49 -08:00
sherlock.rb
sidekiq_config.rb Use a dedicated queue for each worker 2017-12-12 17:36:20 +01:00
sidekiq_logger.rb
sidekiq_status.rb
sidekiq_throttler.rb
sidekiq_versioning.rb Use a dedicated queue for each worker 2017-12-12 17:36:20 +01:00
snippet_search_results.rb
ssh_public_key.rb
storage_check.rb Move the circuitbreaker check out in a separate process 2017-12-08 09:11:39 +01:00
string_range_marker.rb Adds Rubocop rule for line break after guard clause 2017-11-16 17:58:29 +01:00
string_regex_marker.rb
tcp_checker.rb Add a gitlab:tcp_check rake task 2017-12-13 15:53:32 +00:00
themes.rb
time_tracking_formatter.rb
timeless.rb
untrusted_regexp.rb
update_path_error.rb
upgrader.rb
uploads_transfer.rb
url_blocker.rb Merge branch 'ssrf-protections-round-2' into 'security-10-1' 2017-11-08 20:11:08 -08:00
url_builder.rb
url_sanitizer.rb Adds Rubocop rule for line break after guard clause 2017-11-16 17:58:29 +01:00
usage_data.rb Allow password authentication to be disabled entirely 2017-11-23 13:16:14 +00:00
user_access.rb
user_activities.rb
utils.rb Backport which from EE 2017-12-01 15:26:40 -08:00
version_info.rb
visibility_level.rb Forking a project to a namespace with lower visibility. 2017-12-29 11:15:26 +01:00
workhorse.rb Remove Ci::Build#artifacts_file? 2017-12-03 12:04:49 +01:00