gitlab-org--gitlab-foss/lib/gitlab
Rémy Coutable becf29e3ab Merge branch '40530-merge-request-generates-wrong-diff-when-branch-and-tag-have-the-same-name' into 'master'
Resolve "Merge request generates wrong diff when branch and tag have the same name"

Closes #40530

See merge request gitlab-org/gitlab-ce!15591
2017-11-28 18:01:09 +00:00
..
auth Renaming AuthenticationException to AuthenticationError 2017-11-17 13:33:21 +01:00
background_migration Added Rubocop config for background migrations 2017-11-23 13:56:51 +01:00
badge
bare_repository_import Improve GitLab Import rake task to work with Hashed Storage and Subgroups 2017-11-07 19:11:42 +00:00
bitbucket_import Fix bitbucket wiki import with hashed storage enabled 2017-11-20 16:14:41 +00:00
cache
checks Handle forks in Gitlab::Checks::LfsIntegrity 2017-11-09 13:44:20 +00:00
ci Adds Rubocop rule for line break after guard clause 2017-11-16 17:58:29 +01:00
conflict Move line code generation into Gitlab::Git 2017-10-12 22:13:05 -03:00
cycle_analytics
data_builder Use full URL of user avatar on webhook push 2017-10-05 23:54:56 +11:00
database Don't move project repository/attachments when using hashed storage 2017-11-20 13:46:53 +01:00
dependency_linker
diff Batchload blobs for diff generation 2017-11-21 13:53:26 +01:00
downtime_check
email Adds Rubocop rule for line break after guard clause 2017-11-16 17:58:29 +01:00
etag_caching
fogbugz_import Adds Rubocop rule for line break after guard clause 2017-11-16 17:58:29 +01:00
gfm Fix rewriting issue references with group milestones 2017-09-20 09:55:54 +00:00
git Ensure MRs always use branch refs for comparison 2017-11-28 17:01:38 +00:00
gitaly_client Add FetchSourceBranch Gitaly call 2017-11-22 10:19:42 +00:00
github_import Rename fetch_refs to refmap 2017-11-23 16:59:58 +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 Fix error with GPG signature updater when commit was deleted 2017-10-07 10:47:53 -05:00
grape_logging/formatters Use a custom GrapeLogging formatter to get the timestamp 2017-09-07 07:48:13 -07:00
graphs
health_checks Allow the git circuit breaker to correctly handle missing repository storages 2017-09-22 10:05:28 +01:00
hook_data Add total_time_spent to the changes hash in issuable Webhook payloads 2017-11-15 15:42:19 +01:00
i18n Only require simple_po_parser in rake task that needs it 2017-09-04 08:30:10 +02:00
import_export Fix hashed storage for attachments bugs 2017-11-23 17:04:35 +00:00
kubernetes Adds Rubocop rule for line break after guard clause 2017-11-16 17:58:29 +01:00
ldap Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master' 2017-11-20 09:22:14 +00:00
legacy_github_import Rename fetch_refs to refmap 2017-11-23 16:59:58 +01:00
metrics Use feature flag instead of application settigns to control if method calls should be instrumented 2017-11-23 23:39:10 +01:00
middleware Revert "check for read_only? first before seeing if request is disallowed" 2017-11-21 15:35:30 +01:00
o_auth Changing OAuth lookup to be case insensitive 2017-11-17 14:24:25 +00:00
performance_bar Fix SQL timings for the performance bar 2017-11-03 15:45:58 +01:00
project_authorizations
prometheus
quick_actions added date parameter for time tracking 2017-10-13 11:41:49 +01:00
redis
request_profiler
saml Adds Rubocop rule for line break after guard clause 2017-11-16 17:58:29 +01:00
sanitizers
serializer
sherlock Ignore SQL CACHE hits in Sherlock 2017-11-03 16:08:37 +01:00
sidekiq_middleware Send SIGSTP before SIGTERM to actually give Sidekiq jobs 30s to finish when the memory killer kicks in 2017-11-02 15:33:19 +01:00
sidekiq_status
slash_commands
sql Don't break when building unions on empty collections 2017-10-04 22:49:41 +02:00
template Adds Rubocop rule for line break after guard clause 2017-11-16 17:58:29 +01:00
testing fix bracket styling 2017-11-02 10:20:11 -05:00
utils Add Gitlab::Utils::StrongMemoize 2017-11-13 15:27:30 +00:00
view/presenter
access.rb Clarify wording of protected branch settings for the default branch 2017-11-20 16:09:56 +00:00
allowable.rb
app_logger.rb
asciidoc.rb current_application_settings belongs on Gitlab::CurrentSettings 2017-08-31 13:38:33 +01:00
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 Allow creating merge requests across forks of a project 2017-10-07 11:46:23 +02:00
color_schemes.rb
config_helper.rb
contributions_calendar.rb
contributor.rb
current_settings.rb current_application_settings belongs on Gitlab::CurrentSettings 2017-08-31 13:38:33 +01:00
daemon.rb Adds Rubocop rule for line break after guard clause 2017-11-16 17:58:29 +01:00
database.rb Add returning IDs to Gitlab::Database.bulk_insert 2017-11-07 22:28:57 +01:00
dependency_linker.rb
downtime_check.rb
ee_compat_check.rb In EeCompatCheck, always reset to canonical-ee/master when applying a patch 2017-11-23 10:10:01 +01:00
emoji.rb
encoding_helper.rb Fix encoding bugs in Gitlab::Git::User 2017-11-23 10:48:57 +00:00
environment.rb
environment_logger.rb
exclusive_lease.rb Adds exclusive lease to Git garbage collect worker. 2017-09-07 18:52:04 +01:00
fake_application_settings.rb
file_detector.rb Cache issuable template names 2017-10-12 13:26:03 +01:00
file_finder.rb
git.rb Move line code generation into Gitlab::Git 2017-10-12 22:13:05 -03:00
git_access.rb Move all rugged operation for ff_merge inside Gitlab::Git 2017-10-24 14:31:52 -03:00
git_access_wiki.rb Create idea of read-only database 2017-10-06 22:37:40 +02:00
git_logger.rb
git_post_receive.rb
git_ref_validator.rb Prevent branches or tags from starting with invalid characters (e.g. -, .) 2017-10-05 14:56:36 -07:00
gitaly_client.rb Add controller#action metrics on Gitaly 2017-11-28 15:15:50 +01: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 Icon Sprite URL is also local even if asset_host is set 2017-11-09 10:38:00 +01:00
gpg.rb Address feedback from last code review 2017-10-05 08:25:27 -05:00
group_hierarchy.rb Reuse base_and_ancestors for ancestors in GroupHierarchy 2017-10-10 16:55:02 +02:00
highlight.rb
i18n.rb Add Dutch as an available language. 2017-09-18 17:13:47 +02:00
identifier.rb
import_export.rb Finish migration to the new events setup 2017-09-06 16:40:31 +02:00
import_formatter.rb
import_sources.rb Replace old GH importer with the parallel importer 2017-11-07 23:25:03 +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 Re-use issue/MR counts for the pagination system 2017-09-05 11:53:45 +02:00
issues_labels.rb
job_waiter.rb Rewrite the GitHub importer from scratch 2017-11-07 23:24:59 +01:00
kubernetes.rb Fix broken certificate-authority-data with kubectl >= 1.8.0 2017-10-03 09:10:40 +02:00
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 Memoize GitLab logger to reduce open file descriptors 2017-10-24 14:06:23 +03:00
mail_room.rb Decrease Cyclomatic Complexity threshold to 13 2017-09-12 17:02:11 +00:00
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 Add GitLab-Pages version to Admin Dashboard 2017-09-07 22:02:57 -05:00
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 current_application_settings belongs on Gitlab::CurrentSettings 2017-08-31 13:38:33 +01:00
polling_interval.rb current_application_settings belongs on Gitlab::CurrentSettings 2017-08-31 13:38:33 +01:00
popen.rb
project_search_results.rb
project_template.rb Update template description wording 2017-10-11 08:47:31 -07:00
project_transfer.rb
prometheus_client.rb
protocol_access.rb current_application_settings belongs on Gitlab::CurrentSettings 2017-08-31 13:38:33 +01:00
recaptcha.rb current_application_settings belongs on Gitlab::CurrentSettings 2017-08-31 13:38:33 +01:00
reference_counter.rb Implement /internal/post_receive unified endpoint for PostReceive tasks 2017-08-31 11:31:45 -03:00
reference_extractor.rb
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 Drastically improve project search performance by no longer searching namespace name 2017-11-24 15:57:17 +01:00
seeder.rb
sentry.rb Merge branch 'bvl-validate-po-files' into 'master' 2017-09-01 14:30:43 +00:00
shell.rb Set the default gitlab-shell timeout to 3 hours 2017-11-21 17:32:37 +00:00
shell_adapter.rb Memoize GitlabShellAdapter for performance and ease of testing 2017-11-20 23:28:49 -08:00
sherlock.rb
sidekiq_logger.rb
sidekiq_status.rb Simplify check for running job on Redis 2017-10-13 10:17:41 +02:00
sidekiq_throttler.rb
snippet_search_results.rb
ssh_public_key.rb Address review comments 2017-08-30 20:50:44 +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
themes.rb Revert "Merge branch 'revert-f2421b2b' into 'master'" 2017-09-11 15:44:42 +00:00
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 Add a linter for PO files 2017-08-31 14:10:04 +02:00
version_info.rb
visibility_level.rb Adds Rubocop rule for line break after guard clause 2017-11-16 17:58:29 +01:00
workhorse.rb Adds Rubocop rule for line break after guard clause 2017-11-16 17:58:29 +01:00