Jan Provaznik 27a75ea175 Backport 'Rebase' feature from EE to CE ... When a project uses fast-forward merging strategy user has to rebase MRs to target branch before it can be merged. Now user can do rebase in UI by clicking 'Rebase' button instead of doing rebase locally. This feature was already present in EE, this is only backport of the feature to CE. Couple of changes: * removed rebase license check * renamed migration (changed timestamp) Closes #40301		2018-01-05 09:34:59 +01:00
..
bin
config
controllers	Backport 'Rebase' feature from EE to CE	2018-01-05 09:34:59 +01:00
db/production
factories	41054-Disallow creation of new Kubernetes integrations	2018-01-04 09:33:51 +00:00
features	Create Kubernetes based on Application Templates	2018-01-04 22:35:41 +00:00
finders	Replace '.team << [user, role]' with 'add_role(user)' in specs	2017-12-22 19:18:28 +11:00
fixtures	Backport 'Rebase' feature from EE to CE	2018-01-05 09:34:59 +01:00
helpers	Replace '.team << [user, role]' with 'add_role(user)' in specs	2017-12-22 19:18:28 +11:00
initializers
javascripts	Backport 'Rebase' feature from EE to CE	2018-01-05 09:34:59 +01:00
lib	Fix a bug where charlock_holmes was used needlessly to encode strings	2018-01-04 19:27:37 -03:00
mailers	Replace '.team << [user, role]' with 'add_role(user)' in specs	2017-12-22 19:18:28 +11:00
migrations	Merge branch 'mk-no-op-delete-conflicting-redirects' into 'master'	2018-01-04 15:57:45 +00:00
models	Backport 'Rebase' feature from EE to CE	2018-01-05 09:34:59 +01:00
policies	Replace '.team << [user, role]' with 'add_role(user)' in specs	2017-12-22 19:18:28 +11:00
presenters	Backport 'Rebase' feature from EE to CE	2018-01-05 09:34:59 +01:00
requests	Merge branch 'osw-introduce-merge-request-statistics' into 'master'	2018-01-04 09:38:41 +00:00
routing
rubocop/cop	Use gitlab-styles	2017-12-22 08:34:44 -06:00
serializers	Backport 'Rebase' feature from EE to CE	2018-01-05 09:34:59 +01:00
services	Backport 'Rebase' feature from EE to CE	2018-01-05 09:34:59 +01:00
sidekiq/cron
support	Added multi editor setting on the profile preferences page	2018-01-04 18:31:05 +00:00
tasks
unicorn
uploaders	Replace factory_girl_rails with factory_bot_rails	2017-12-14 15:01:55 +01:00
validators
views	Backport 'Rebase' feature from EE to CE	2018-01-05 09:34:59 +01:00
workers	Backport 'Rebase' feature from EE to CE	2018-01-05 09:34:59 +01:00
factories_spec.rb	Replace factory_girl_rails with factory_bot_rails	2017-12-14 15:01:55 +01:00
rails_helper.rb
rake_helper.rb
simplecov_env.rb
spec_helper.rb	Replace factory_girl_rails with factory_bot_rails	2017-12-14 15:01:55 +01:00