gitlab-org--gitlab-foss/lib
Douwe Maan 46015c1540 Merge branch 'rs-rename-run-helper' into 'master'
Rename `run` task helper method to prevent conflict with StateMachine

This prevents the following message from appearing whenever running a
Rake task:

    Instance method "run" is already defined in Object, use generic
    helper instead or set StateMachines::Machine.ignore_method_conflicts
    = true.

See merge request !5750
2016-08-10 00:19:28 +00:00
..
api Retain old behavior 2016-08-09 09:42:49 -06:00
assets
backup Fix backup restore 2016-07-25 06:23:07 -07:00
banzai Merge branch 'relative-link-filter-ref' into 'master' 2016-08-09 21:45:59 +00:00
ci Remove legacy Ci::StaticModel we do not use anymore 2016-08-08 14:22:26 +02:00
container_registry Make rubocop happy 2016-07-15 18:05:39 +02:00
gitlab Merge branch 'gh-pull-requests' into 'master' 2016-08-09 23:26:15 +00:00
json_web_token Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
omni_auth
rouge/formatters Trim extra displayed carriage returns in diffs and files with CRLFs 2016-08-01 13:24:06 +02:00
support Revert "Defend against 'Host' header injection" 2016-08-08 13:02:44 +02:00
tasks Rename run task helper method to prevent conflict with StateMachine 2016-08-09 18:31:51 -05:00
banzai.rb Object renderer read_multi rendered entries from Cache 2016-07-12 14:35:29 +02:00
disable_email_interceptor.rb Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
event_filter.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
extracts_path.rb
file_size_validator.rb
file_streamer.rb
gitlab.rb Update Gitlab.com? to support staging 2016-06-27 15:10:36 -04:00
gt_one_coercion.rb
repository_cache.rb Use project ID in repository cache to prevent stale data from persisting across projects 2016-07-25 05:09:28 -07:00
static_model.rb
unfold_form.rb
uploaded_file.rb Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
version_check.rb