gitlab-org--gitlab-foss/spec
Grzegorz Bizon 5b718d4825 Merge branch 'master' into feature/gb/migrate-pipeline-stages
* master: (524 commits)
  Improve user experience around slash commands in instant comments
  Fix LFS timeouts when trying to save large files
  retryable? is now available for CommitStatus
  Resolve "Documentation of `.gitlab-ci.yml` states incorrect example for variables"
  Fix test failures
  Add slugify project path to CI enviroment variables
  Fixed typo: craeted -> created
  32118 Make New environment empty state btn lowercase
  Expose import_status in Projects API
  32832 Remove overflow from comment form for confidential issues and vertically aligns confidential issue icon
  Fix test failures
  Allow manual bypass of auto_sign_in_with_provider
  Fix keys seed
  Allow users to be hard-deleted from the API
  fixup some classnames and media queries
  Enable the Style/PreferredHashMethods cop
  Lint our factories creation in addition to their build
  Don’t schedule workers from inside transactions
  Allow scheduling from after_commit hooks
  Forbid Sidekiq scheduling in transactions
  ...

Conflicts:
	db/schema.rb
	spec/spec_helper.rb
2017-06-05 13:13:38 +02:00
..
bin Enable the RSpec/ExpectOutput cop 2017-05-18 18:56:26 +02:00
config
controllers Merge branch 'zj-job-view-goes-real-time' into 'master' 2017-06-05 10:24:57 +00:00
db/production Move rainbow monkey patch to String to spec_helper 2017-05-31 14:33:03 +02:00
factories Merge branch '30469-convdev-index' into 'master' 2017-06-05 09:18:12 +00:00
features Merge branch '30469-convdev-index' into 'master' 2017-06-05 09:18:12 +00:00
finders Add :owned param to ProjectFinder 2017-05-30 22:45:59 +02:00
fixtures Remove deleted_at from Entity. Use find_by. Remove returns. 2017-05-30 23:55:09 +09:00
helpers Merge remote-tracking branch 'origin/master' into fix-realtime-edited-text-for-issues-9-3 2017-06-02 17:17:54 +01:00
initializers
javascripts Merge branch 'fix-realtime-edited-text-for-issues-9-3' into 'master' 2017-06-05 10:42:33 +00:00
lib Merge branch 'master' into feature/gb/migrate-pipeline-stages 2017-06-05 13:13:38 +02:00
mailers Bugfix: Always use the default language when generating emails. 2017-05-25 10:22:45 -05:00
migrations Merge branch 'master' into feature/gb/migrate-pipeline-stages 2017-06-05 13:13:38 +02:00
models Merge branch 'fix-realtime-edited-text-for-issues-9-3' into 'master' 2017-06-05 10:42:33 +00:00
policies Use CTEs for nested groups and authorizations 2017-05-17 16:51:08 +02:00
presenters Add Conversational Development Index page to admin panel 2017-06-01 17:37:21 +02:00
requests Merge branch 'projects-api-import-status' into 'master' 2017-06-02 22:16:54 +00:00
routing Merge branch '17848-web-hook-logging' into 'master' 2017-05-25 13:26:12 +00:00
rubocop/cop Added Cop to blacklist the use of serialize 2017-05-31 14:03:37 +02:00
serializers Fix test failures 2017-06-03 13:58:31 +02:00
services Merge branch 'master' into feature/gb/migrate-pipeline-stages 2017-06-05 13:13:38 +02:00
sidekiq/cron Resolve "Update gem sidekiq-cron from 0.4.4 to 0.6.0 and rufus-scheduler from 3.1.10 to 3.4.0" 2017-05-10 15:48:09 +00:00
support Merge branch 'master' into feature/gb/migrate-pipeline-stages 2017-06-05 13:13:38 +02:00
tasks rake task to reset all rss tokens 2017-05-24 22:29:59 +02:00
unicorn Remove config lines in one place 2017-04-28 13:51:19 +02:00
uploaders Fix LFS timeouts when trying to save large files 2017-06-04 21:51:59 -07:00
validators Avoid crash when trying to parse string with invalid UTF-8 sequence 2017-05-30 15:05:52 +00:00
views Merge branch 'dm-collapsed-blob' into 'master' 2017-06-01 09:10:53 +00:00
workers Add Conversational Development Index page to admin panel 2017-06-01 17:37:21 +02:00
factories_spec.rb Lint our factories creation in addition to their build 2017-06-02 19:06:50 +02:00
rails_helper.rb
rake_helper.rb
simplecov_env.rb
spec_helper.rb Merge branch 'master' into feature/gb/migrate-pipeline-stages 2017-06-05 13:13:38 +02:00