Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge remote-tracking branch 'kscott/master'

Conflicts:
	ruby-machinist/mp.snippet
	ruby-machinist/plan.snippet
	ruby-rails/log.snippet
	ruby-rails/logr.snippet
	ruby/rep.snippet
	ruby/report.snippet
	snippets/ruby-machinist/mp.snippet
	snippets/ruby-rails/log.snippet
	snippets/ruby-remarkable/sabaf.snippet
	snippets/ruby-remarkable/samao.snippet
	snippets/ruby-remarkable/samao_re.snippet
	snippets/ruby-remarkable/savf.snippet
	snippets/ruby-remarkable/savf_re.snippet
	snippets/ruby-remarkable/sbt.snippet
	snippets/ruby-remarkable/sbt_re.snippet
	snippets/ruby-remarkable/shabtm.snippet
	snippets/ruby-remarkable/shabtm_re.snippet
	snippets/ruby-remarkable/shc.snippet
	snippets/ruby-remarkable/shc_re.snippet
	snippets/ruby-remarkable/shds.snippet
	snippets/ruby-remarkable/shi.snippet
	snippets/ruby-remarkable/shi_re.snippet
	snippets/ruby-remarkable/shm.snippet
	snippets/ruby-remarkable/shm_re.snippet
	snippets/ruby-remarkable/shmt.snippets
	snippets/ruby-remarkable/shns.snippet
	snippets/ruby-remarkable/shns_re.snippet
	snippets/ruby-remarkable/sho.snippet
	snippets/ruby-remarkable/sho_re.snippet
	snippets/ruby/rep.snippet
  • Loading branch information...
commit 57263abc99570f80f5efb7ee4b84f4fd1ebb6ed4 2 parents d840d07 + 3ddaa09
@spf13 authored
Showing with 9 additions and 45 deletions.
  1. +1 −0  php/while.snippet
  2. +1 −0  ruby-machinist/plan.snippet
  3. +1 −0  ruby/report.snippet
  4. +4 −2 snippets/php/class.snippet
  5. +2 −1  snippets/php/fun.snippet
  6. +0 −2  snippets/ruby-remarkable/sabaf.snippet
  7. +0 −2  snippets/ruby-remarkable/samao.snippet
  8. +0 −2  snippets/ruby-remarkable/samao_re.snippet
  9. +0 −2  snippets/ruby-remarkable/savf.snippet
  10. +0 −2  snippets/ruby-remarkable/savf_re.snippet
  11. +0 −2  snippets/ruby-remarkable/sbt.snippet
  12. +0 −2  snippets/ruby-remarkable/sbt_re.snippet
  13. +0 −2  snippets/ruby-remarkable/shabtm.snippet
  14. +0 −2  snippets/ruby-remarkable/shabtm_re.snippet
  15. +0 −2  snippets/ruby-remarkable/shc.snippet
  16. +0 −2  snippets/ruby-remarkable/shc_re.snippet
  17. +0 −2  snippets/ruby-remarkable/shds.snippet
  18. +0 −2  snippets/ruby-remarkable/shi.snippet
  19. +0 −2  snippets/ruby-remarkable/shi_re.snippet
  20. +0 −2  snippets/ruby-remarkable/shm.snippet
  21. +0 −2  snippets/ruby-remarkable/shm_re.snippet
  22. +0 −2  snippets/ruby-remarkable/shmt.snippets
  23. +0 −2  snippets/ruby-remarkable/shns.snippet
  24. +0 −2  snippets/ruby-remarkable/shns_re.snippet
  25. +0 −2  snippets/ruby-remarkable/sho.snippet
  26. +0 −2  snippets/ruby-remarkable/sho_re.snippet
View
1  php/while.snippet
View
1  ruby-machinist/plan.snippet
@@ -0,0 +1 @@
+${1:Model}.plan
View
1  ruby/report.snippet
@@ -0,0 +1 @@
+results.report("${1:name}:") { TESTS.times { ${2} } }
View
6 snippets/php/class.snippet
@@ -1,9 +1,11 @@
/**
* ${1}
*/
-class ${2:ClassName} {
+class ${2:ClassName}
+{
${3}
- function ${4:__construct}(${5:argument}) {
+ function ${4:__construct}(${5:$argument})
+ {
${6:// code...}
}
}
View
3  snippets/php/fun.snippet
@@ -1,3 +1,4 @@
-${1:public }function ${2:FunctionName}(${3}) {
+${1:public }function ${2:FunctionName}(${3})
+{
${4:// code...}
}
View
2  snippets/ruby-remarkable/sabaf.snippet
@@ -1,2 +0,0 @@
-should_accept_nested_attibutes_for :${1:models}${2:, :allow_destroy => true}
-${2}
View
2  snippets/ruby-remarkable/samao.snippet
@@ -1,2 +0,0 @@
-should_allow_mass_assignment_of :${1:field}
-${2}
View
2  snippets/ruby-remarkable/samao_re.snippet
@@ -1,2 +0,0 @@
-should_allow_mass_assignment_of :${1:field}
-${2}
View
2  snippets/ruby-remarkable/savf.snippet
@@ -1,2 +0,0 @@
-should_allow_values_for :${1:field}, "${2:value}"
-${3}
View
2  snippets/ruby-remarkable/savf_re.snippet
@@ -1,2 +0,0 @@
-should_allow_values_for :${1:field}, "${2:value}"
-${3}
View
2  snippets/ruby-remarkable/sbt.snippet
@@ -1,2 +0,0 @@
-should_belong_to :${1:field}${2:, :polymorphic => true}
-${3}
View
2  snippets/ruby-remarkable/sbt_re.snippet
@@ -1,2 +0,0 @@
-should_belong_to :${1:field}${2:, :polymorphic => true}
-${3}
View
2  snippets/ruby-remarkable/shabtm.snippet
@@ -1,2 +0,0 @@
-should_have_and_belong_to_many :${1:models}
-${3}
View
2  snippets/ruby-remarkable/shabtm_re.snippet
@@ -1,2 +0,0 @@
-should_have_and_belong_to_many :${1:models}
-${3}
View
2  snippets/ruby-remarkable/shc.snippet
@@ -1,2 +0,0 @@
-should_have_column :${1:name}, :type => :${2:string}
-${3}
View
2  snippets/ruby-remarkable/shc_re.snippet
@@ -1,2 +0,0 @@
-should_have_column :${1:name}, :type => :${2:string}
-${3}
View
2  snippets/ruby-remarkable/shds.snippet
@@ -1,2 +0,0 @@
-should_have_default_scope :conditions => { ${1} }
-${2}
View
2  snippets/ruby-remarkable/shi.snippet
@@ -1,2 +0,0 @@
-should_have_index :${1:column}${2:, :unique => true}
-${3}
View
2  snippets/ruby-remarkable/shi_re.snippet
@@ -1,2 +0,0 @@
-should_have_index :${1:column}${2:, :unique => true}
-${3}
View
2  snippets/ruby-remarkable/shm.snippet
@@ -1,2 +0,0 @@
-should_have_many :${1:models}${2:, :dependent => :destroy}
-${3}
View
2  snippets/ruby-remarkable/shm_re.snippet
@@ -1,2 +0,0 @@
-should_have_many :${1:models}${2:, :dependent => :destroy}
-${3}
View
2  snippets/ruby-remarkable/shmt.snippets
@@ -1,2 +0,0 @@
-should_have_many :${1:models}, :through => :${2:model}${3:, :dependent => :destroy}
-${4}
View
2  snippets/ruby-remarkable/shns.snippet
@@ -1,2 +0,0 @@
-should_have_named_scope :${1:name}, :conditions => { ${2} }
-${3}
View
2  snippets/ruby-remarkable/shns_re.snippet
@@ -1,2 +0,0 @@
-should_have_named_scope :${1:name}, :conditions => { ${2} }
-${3}
View
2  snippets/ruby-remarkable/sho.snippet
@@ -1,2 +0,0 @@
-should_have_one :${1:model}
-${2}
View
2  snippets/ruby-remarkable/sho_re.snippet
@@ -1,2 +0,0 @@
-should_have_one :${1:model}
-${2}
Please sign in to comment.
Something went wrong with that request. Please try again.