gitlab-org--gitlab-foss/lib
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
..
api Merge branch 'bvl-rename-build-events-to-job-events' into 'master' 2017-05-16 14:12:19 +02:00
assets
backup Merge branch 'gl-version-backup-file' into 'master' 2017-04-26 18:22:33 +00:00
banzai Catch all URI errors in ExternalLinkFilter 2017-05-18 10:47:23 -05:00
bitbucket
ci Enable the Style/TrailingCommaInLiteral cop 2017-05-10 18:25:45 +02:00
constraints Redirect from redirect routes to canonical routes 2017-05-05 12:11:57 -07:00
container_registry Properly handle container registry redirects to fix metadata stored on a S3 backend 2017-05-17 07:04:34 -07:00
generators/rails/post_deployment_migration
github Reset create callbacks for Issues/MRs while importing GitHub projects 2017-05-11 17:30:56 -03:00
gitlab Merge branch 'dm-no-conflicts-when-branches-are-missing' into 'master' 2017-05-18 22:13:20 +00:00
json_web_token
mattermost
microsoft_teams
omni_auth
rouge
support
tasks
additional_email_headers_interceptor.rb
banzai.rb
disable_email_interceptor.rb
email_template_interceptor.rb
event_filter.rb
expand_variables.rb
extracts_path.rb
file_size_validator.rb
file_streamer.rb
gitlab.rb
gt_one_coercion.rb
repository_cache.rb
static_model.rb
unfold_form.rb
uploaded_file.rb
version_check.rb