Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into feature/improve-weight-filter
James Lopez authored
# Conflicts:
#	app/views/shared/issuable/_sidebar.html.haml
ebb5afe7
Name Last commit Last update
..
benchmarks Move Markdown/reference logic from Gitlab::Markdown to Banzai
controllers Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-upstream
factories Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-upstream
features Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into feature/improve-weight-filter
finders Merge remote-tracking branch 'origin/master' into ce_upstream
fixtures Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstream
helpers Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-upstream
initializers Ensure Gravatar host looks like an actual host
javascripts Project dropdown test span -> i
lib Merge branch 'es_specs' into 'master'
mailers Merge remote-tracking branch 'origin/master' into ce_master
models Merge branch 'es_specs' into 'master'
requests Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-upstream
routing Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstream
services Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-upstream
support tests for ES code
tasks/gitlab Fix specs
views Re-introduce "Send email to users" link in Admin area
workers Move most of PagesWorker logic UpdatePagesService
factories.rb Added specs for Gitlab::Geo
factories_spec.rb Remove the invalid key factories
rails_helper.rb Started on the actual rspec 3 upgrade
spec_helper.rb Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-upstream
teaspoon_env.rb teaspoon install