gitlab-org--gitlab-foss/spec
Grzegorz Bizon c5912ecd73 Merge branch 'master' into feature/multi-level-container-registry-images
* master: (1327 commits)
  Merge branch 'render-json-leak' into 'security'
  Merge branch 'ssrf' into 'security'
  Merge branch 'ssrf' into 'security'
  Merge branch 'fix-links-target-blank' into 'security'
  Merge branch '28058-hide-emails-in-atom-feeds' into 'security'
  Fix karma test
  Reset filters after click
  Handle Route#name being nil after an update
  Only add frontend code coverage instrumentation when generating coverage report
  fix recompile assets step in 9.0 upgrade guide to use yarn
  Undo explicit conversion to Integer
  Make level_value accept string integers
  Make feature spec more robust
  Removed d3.js from the main application.js bundle
  Extend compound status for manual actions specs
  Update css to be nice and tidy.
  Fix pipeline status for transition between stages
  add an index to the ghost column
  Return 404 in project issues API endpoint when project cannot be found
  Improve rename projects migration
  ...

Conflicts:
	doc/ci/docker/using_docker_build.md
	spec/lib/gitlab/import_export/all_models.yml
2017-03-21 14:22:56 +01:00
..
bin
config Fix redis spec 2017-03-15 18:36:20 -06:00
controllers Merge branch 'sh-fix-admin-application-settings' into 'master' 2017-03-21 07:21:01 +00:00
db/production
factories Merge branch 'master' into feature/multi-level-container-registry-images 2017-03-21 14:22:56 +01:00
features Merge branch 'master' into feature/multi-level-container-registry-images 2017-03-21 14:22:56 +01:00
finders Allow filtering by all started milestones 2017-03-15 17:02:38 +00:00
fixtures Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues 2017-03-07 13:42:45 +02:00
helpers Todos performance: Include associations in Finder 2017-03-20 12:45:43 +01:00
initializers Improve storage validation after configuration structure update 2017-03-08 15:51:30 -03:00
javascripts Merge branch 'add-filter-focus-style' into 'master' 2017-03-21 04:25:22 +00:00
lib Merge branch 'master' into feature/multi-level-container-registry-images 2017-03-21 14:22:56 +01:00
mailers All CI offline migrations 2017-03-17 23:06:11 +00:00
migrations All CI offline migrations 2017-03-17 23:06:11 +00:00
models Merge branch 'master' into feature/multi-level-container-registry-images 2017-03-21 14:22:56 +01:00
policies spec the new behavior of .class_for 2017-03-09 11:49:53 -08:00
presenters Added test case for the avaiable project keys 2017-03-06 14:42:04 -06:00
requests Return 404 in project issues API endpoint when project cannot be found 2017-03-20 18:03:29 +01:00
routing Implement OpenID Connect identity provider 2017-03-07 14:54:35 +01:00
rubocop/cop Add cop to ensure reversibility of add_concurrent_index 2017-03-07 10:09:01 -06:00
serializers
services Merge branch 'master' into feature/multi-level-container-registry-images 2017-03-21 14:22:56 +01:00
support Add a new have_html_escaped_body_text that match an HTML-escaped text 2017-03-17 12:20:54 +01:00
tasks Merge branch '28447-hybrid-repository-storages' into 'master' 2017-03-07 16:55:03 +00:00
uploaders Handle relative and absolute Upload paths in the Uploaders 2017-03-06 14:41:10 -05:00
views Adds pipeline mini-graph to system information box in Commit View 2017-03-16 00:44:31 +00:00
workers All CI offline migrations 2017-03-17 23:06:11 +00:00
factories_spec.rb
rails_helper.rb
rake_helper.rb
simplecov_env.rb Futher rename the CI variables 2017-03-16 08:49:01 +01:00
spec_helper.rb Retry only on feature specs that use JS, on CI 2017-03-13 17:33:17 +01:00