Alejandro Rodríguez 3fcab51ebb Refactor conflict resolution to contain git ops within Gitlab::Git ... This prepares the codebase for a Gitaly migration. See https://gitlab.com/gitlab-org/gitaly/issues/553		2017-10-12 22:03:14 -03:00
..
bin	…
config	…
controllers	Refactor conflict resolution to contain git ops within Gitlab::Git	2017-10-12 22:03:14 -03:00
db/production	…
factories	add spec	2017-10-11 16:41:36 -04:00
features	Merge branch 'replace_explore_projects.feature' into 'master'	2017-10-11 17:15:09 +00:00
finders	Add a project forks spec helper	2017-10-07 11:46:23 +02:00
fixtures	Merge branch 'master' into '37970-ci-sections-tracking'	2017-10-07 08:07:33 +00:00
helpers	Merge branch '38245-private-avatars-are-not-cdn-compatible' into 'master'	2017-10-10 12:48:19 +00:00
initializers	Upgrade doorkeeper-openid_connect	2017-09-20 17:38:33 +02:00
javascripts	Add create merge checkbox.	2017-10-12 21:04:17 +00:00
lib	Refactor conflict resolution to contain git ops within Gitlab::Git	2017-10-12 22:03:14 -03:00
mailers	Don't show an "Unsubscribe" link in snippet comment notifications	2017-10-09 15:03:05 +02:00
migrations	Merge branch '37552-replace-js-true-with-js' into 'master'	2017-10-09 12:23:26 +00:00
models	Move Gitlab::Diff::LineCode to module Gitlab::Git	2017-10-12 21:45:16 -03:00
policies	Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service' into 'master'	2017-10-06 17:06:55 +00:00
presenters	Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service	2017-10-07 00:27:15 +09:00
requests	Move all API authentication code to APIGuard	2017-10-12 11:13:37 +02:00
routing	…
rubocop/cop	Also warn on timestamp in datetime migration cop	2017-10-10 10:36:10 +01:00
serializers	Stop using `branch_names.include?` and use `branch_exists?`	2017-10-10 14:56:04 +00:00
services	Refactor conflict resolution to contain git ops within Gitlab::Git	2017-10-12 22:03:14 -03:00
sidekiq/cron	…
support	Merge branch '37691-subscription-fires-multiple-notifications' into 'master'	2017-10-12 14:39:51 +00:00
tasks	Gitaly namespace service enabled for GitLab	2017-10-05 14:11:32 +02:00
unicorn	…
uploaders	…
validators	…
views	Add a project forks spec helper	2017-10-07 11:46:23 +02:00
workers	Backports EE 38771 changes to CE.	2017-10-10 10:13:00 +01:00
factories_spec.rb	…
rails_helper.rb	…
rake_helper.rb	…
simplecov_env.rb	…
spec_helper.rb	Improve the flaky examples detection jobs	2017-10-04 15:14:38 +02:00