houston-core 0.7.0.beta3 → 0.7.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 081a232807d05f2d41fe46f30a026da4724aae42
-  data.tar.gz: dd2e049ba04b12782241352113fd0badaaf34ff6
+  metadata.gz: f6c7d2f0537e31c913013579570a403c3ed71e62
+  data.tar.gz: bae46e8b42c70baaeebef413cfe6b38fdc72aab1
 SHA512:
-  metadata.gz: 340fb1900ec277a8d88cddbdf2b15878fc6614d52854976e3ed60863189d6491b560cbe3197fbccfd09fb23c105cfd98fcbbc6e90a87744682c8f8fa3bbccc45
-  data.tar.gz: ec50b40d5a53fa0dec6b337791c627ba3c6a92ffea95e0f6eef64e1ff66c122e1817787daf6ce8d806a8b0e77bcffd9713744fb39f83a496c07fcc5e6cacc648
+  metadata.gz: 01c289fcc4cd1aaff9496d2273b3703d87184f9ec4d1742f518fdf0d3861215cae4ef92889ba952fa3e7a6b3fe09ed3d8c2278cd30b61aee1601900e24b055fd
+  data.tar.gz: b2f67d2a12797f57aa6e246889c051b6a68ac5733eb743c433e75f21f12b3beb00def052249166e4c258c9af992abed167248d31b115e389bfd29cc274438e02

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    houston-core (0.7.0.beta3)
+    houston-core (0.7.0.beta4)
       activerecord-import
       activerecord-pluck_in_batches
       addressable (~> 2.3.8)
@@ -36,7 +36,7 @@ PATH
       premailer (~> 1.8.6)
       progressbar
       rack-utf8_sanitizer (~> 1.3.1)
-      rails (~> 4.2.5.1)
+      rails (~> 4.2.5)
       redcarpet (~> 3.3.2)
       rufus-scheduler (~> 3.2.0)
       rugged (~> 0.24.0)
@@ -51,40 +51,40 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.5.2)
-      actionpack (= 4.2.5.2)
-      actionview (= 4.2.5.2)
-      activejob (= 4.2.5.2)
+    actionmailer (4.2.7)
+      actionpack (= 4.2.7)
+      actionview (= 4.2.7)
+      activejob (= 4.2.7)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.5.2)
-      actionview (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    actionpack (4.2.7)
+      actionview (= 4.2.7)
+      activesupport (= 4.2.7)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.5.2)
-      activesupport (= 4.2.5.2)
+    actionview (4.2.7)
+      activesupport (= 4.2.7)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.5.2)
-      activesupport (= 4.2.5.2)
+    activejob (4.2.7)
+      activesupport (= 4.2.7)
       globalid (>= 0.3.0)
-    activemodel (4.2.5.2)
-      activesupport (= 4.2.5.2)
+    activemodel (4.2.7)
+      activesupport (= 4.2.7)
       builder (~> 3.1)
-    activerecord (4.2.5.2)
-      activemodel (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    activerecord (4.2.7)
+      activemodel (= 4.2.7)
+      activesupport (= 4.2.7)
       arel (~> 6.0)
-    activerecord-import (0.13.0)
-      activerecord (>= 3.0)
+    activerecord-import (0.15.0)
+      activerecord (>= 3.2)
     activerecord-pluck_in_batches (0.1.1)
       activerecord
-    activesupport (4.2.5.2)
+    activesupport (4.2.7)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -119,14 +119,14 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
-    concurrent-ruby (1.0.1)
+    concurrent-ruby (1.0.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    css_parser (1.4.1)
+    css_parser (1.4.5)
       addressable
     default_value_for (3.0.1)
       activerecord (>= 3.2.0, < 5.0)
-    devise (3.5.7)
+    devise (3.5.10)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
@@ -137,7 +137,7 @@ GEM
       actionmailer (>= 3.2.6, < 5)
       devise (>= 3.2.0)
     docile (1.1.5)
-    domain_name (0.5.20160310)
+    domain_name (0.5.20160615)
       unf (>= 0.0.5, < 1.0.0)
     engineyard (3.2.1)
       engineyard-cloud-client (~> 2.1)
@@ -154,7 +154,7 @@ GEM
       multi_json (~> 1.6)
     erubis (2.7.0)
     escape (0.0.4)
-    execjs (2.6.0)
+    execjs (2.7.0)
     factory_girl (4.7.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.7.0)
@@ -189,7 +189,7 @@ GEM
       domain_name (~> 0.5)
     i18n (0.7.0)
     json (1.8.3)
-    jwt (1.5.1)
+    jwt (1.5.4)
     launchy (2.4.3)
       addressable (~> 2.3)
     libv8 (3.16.14.13)
@@ -198,9 +198,9 @@ GEM
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
     method_source (0.8.2)
-    mime-types (2.99.1)
+    mime-types (2.99.2)
     mini_portile2 (2.1.0)
-    minitest (5.8.4)
+    minitest (5.9.0)
     minitest-reporters (1.1.8)
       ansi
       builder
@@ -219,15 +219,15 @@ GEM
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)
       pkg-config (~> 1.1.7)
-    oauth2 (1.1.0)
+    oauth2 (1.2.0)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0, < 1.5.2)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
     octokit (4.3.0)
       sawyer (~> 0.7.0, >= 0.5.3)
-    oj (2.15.0)
+    oj (2.17.1)
     openxml-package (0.2.4)
       nokogiri
       ox
@@ -236,15 +236,15 @@ GEM
       nokogiri
       openxml-package (>= 0.2.0)
     orm_adapter (0.5.0)
-    ox (2.4.0)
+    ox (2.4.3)
     pg (0.18.4)
-    pg_search (1.0.5)
+    pg_search (1.0.6)
       activerecord (>= 3.1)
       activesupport (>= 3.1)
       arel
     pkg-config (1.1.7)
-    premailer (1.8.6)
-      css_parser (>= 1.3.6)
+    premailer (1.8.7)
+      css_parser (>= 1.4.5)
       htmlentities (>= 4.0.0)
     progressbar (0.21.0)
     pry (0.10.3)
@@ -256,16 +256,16 @@ GEM
       rack (>= 1.0)
     rack-utf8_sanitizer (1.3.2)
       rack (>= 1.0, < 3.0)
-    rails (4.2.5.2)
-      actionmailer (= 4.2.5.2)
-      actionpack (= 4.2.5.2)
-      actionview (= 4.2.5.2)
-      activejob (= 4.2.5.2)
-      activemodel (= 4.2.5.2)
-      activerecord (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    rails (4.2.7)
+      actionmailer (= 4.2.7)
+      actionpack (= 4.2.7)
+      actionview (= 4.2.7)
+      activejob (= 4.2.7)
+      activemodel (= 4.2.7)
+      activerecord (= 4.2.7)
+      activesupport (= 4.2.7)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.5.2)
+      railties (= 4.2.7)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -275,15 +275,15 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.5.2)
-      actionpack (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    railties (4.2.7)
+      actionpack (= 4.2.7)
+      activesupport (= 4.2.7)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.1.2)
+    rake (11.2.2)
     redcarpet (3.3.4)
     ref (2.0.0)
-    responders (2.1.2)
+    responders (2.2.0)
       railties (>= 4.2.0, < 5.1)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -292,12 +292,12 @@ GEM
     rr (1.1.2)
     ruby-progressbar (1.7.5)
     rubyzip (1.1.7)
-    rufus-scheduler (3.2.0)
+    rufus-scheduler (3.2.1)
     rugged (0.24.0)
     safe_yaml (1.0.4)
     sass (3.4.22)
-    sass-rails (5.0.4)
-      railties (>= 4.0.0, < 5.0)
+    sass-rails (5.0.5)
+      railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
@@ -315,10 +315,10 @@ GEM
       json
       simplecov
     slop (3.6.0)
-    sprockets (3.6.0)
+    sprockets (3.6.3)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.4)
+    sprockets-rails (3.1.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
@@ -331,7 +331,7 @@ GEM
       ref
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (2.0.2)
+    tilt (2.0.5)
     timecop (0.8.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)

data/app/assets/javascripts/houston/app/infinite_scroll.coffee

@@ -7,8 +7,12 @@ class @InfiniteScroll
     @success = options.success
     @error = options.error
 
-    @$window = $(window)
-    @$document = $(document)
+    @$window = @$el.closest('.scrollable')
+    @$document = @$el.closest('.scrollable-document')
+
+    if @$window.length is 0 or @$document.length is 0
+      @$window = $(window)
+      @$document = $(document)
     @$window.scroll _.bind(@onScroll, @)
 
   onScroll: ->

data/app/assets/javascripts/houston/app/models/ticket.coffee

@@ -21,17 +21,12 @@ class window.Ticket extends Backbone.Model
     return false unless seriousness && likelihood && clumsiness
     (0.6 * seriousness + 0.3 * likelihood + 0.1 * clumsiness).toFixed(1)
 
-  testingNotes: ->
-    @testingNotesCollection ||= new TestingNotes(@get('testingNotes'), ticket: @)
-
   releases: ->
     @releasesCollection ||= new Releases(@get('releases'), ticket: @)
 
   commits: ->
     @commitsCollection ||= new Commits(@get('commits'), ticket: @)
 
-  activityStream: ->
-    _.sortBy @testingNotes().models.concat(@commits().models), (item)-> item.get('createdAt')
 
 
   parse: (ticket)->
@@ -41,43 +36,6 @@ class window.Ticket extends Backbone.Model
     ticket
 
 
-  testerVerdicts: ->
-    verdictsByTester = @verdictsByTester(@testingNotesSinceLastRelease())
-    window.testers.map (tester)->
-      testerId: tester.id
-      email: tester.get('email')
-      verdict: verdictsByTester[tester.get('id')] ? 'pending'
-
-  verdict: ->
-    verdicts = _.values(@verdictsByTester(@testingNotesSinceLastRelease()))
-    return 'Failing' if _.include verdicts, 'failing'
-    return 'Pending' if window.testers.length == 0
-
-    minPassingVerdicts = @get('minPassingVerdicts') ? window.testers.length
-    passingVerdicts = _.filter(verdicts, (verdict)=> verdict == 'passing').length
-    return 'Passing' if passingVerdicts >= minPassingVerdicts
-
-    'Pending'
-
-  verdictsByTester: (notes)->
-    verdictsByTester = {}
-    notes.each (note)->
-      testerId = note.get('userId')
-      verdict = note.get('verdict')
-      if verdict == 'fails'
-        verdictsByTester[testerId] = 'failing'
-      else if verdict == 'works'
-        verdictsByTester[testerId] ?= 'passing'
-      else if verdict == 'badticket'
-        verdictsByTester[testerId] ?= 'badticket'
-      else if verdict == 'none'
-        verdictsByTester[testerId] ?= 'comment'
-    verdictsByTester
-
-  testingNotesSinceLastRelease: ->
-    date = @get('lastReleaseAt')
-    if date then @testingNotes().since(date) else @testingNotes()
-
 
   close: ->
     url = "/projects/#{@get 'projectSlug'}/tickets/by_number/#{@get 'number'}/close"

data/app/assets/javascripts/houston/app/ticket_tracker_refresh.coffee

@@ -61,8 +61,6 @@ $ ->
     $('#omnibar').on 'keyup', (e)-> $modal.modal('hide') if e.keyCode is 27
 
   Mousetrap.bind 'g p', -> window.location = '/projects'
-  Mousetrap.bind 'g i', -> window.location = '/itsm/issues'
-  Mousetrap.bind 'g t r', -> window.location = '/testing_report'
   Mousetrap.bind 'g n t', -> window.location = '/tickets/new'
   Mousetrap.bind 'g u', -> window.location = '/users'
 

data/app/assets/javascripts/houston/app/views/keyboard_shortcuts_modal.coffee

@@ -19,12 +19,6 @@ class @KeyboardShortcutsModal
       ,
         keys: ['g', 'q']
         name: 'Go to Pull Requests'
-      ,
-        keys: ['g', 'i']
-        name: 'Go to ITSMs'
-      ,
-        keys: ['g', 't', 'r']
-        name: 'Go to Testing Report'
       ,
         keys: ['g', 'n', 't']
         name: 'Go to New Ticket'

data/app/assets/javascripts/houston/core/handlebars_helpers.coffee

@@ -72,11 +72,6 @@ Handlebars.registerHelper 'linkToCommit', (commit)->
   else
     sha
 
-Handlebars.registerHelper 'testerAvatar', (email, size, title)->
-  tester = window.testers.findByEmail(email)
-  gravatarUrl = "https://www.gravatar.com/avatar/#{MD5(email.toLowerCase().trim())}?r=g&d=retro&s=#{size * 2}"
-  "<img src=\"#{gravatarUrl}\" width=\"#{size}\" height=\"#{size}\" rel=\"tooltip\" title=\"#{tester.get('name')}\" />"
-
 Handlebars.registerHelper 'userAvatar', (size)->
   user = window.user
   gravatarUrl = "https://www.gravatar.com/avatar/#{MD5(user.get('email').toLowerCase().trim())}?r=g&d=retro&s=#{size * 2}"

data/app/assets/stylesheets/houston/application/actions.scss

@@ -0,0 +1,15 @@
+.action-last,
+.action-duration,
+.action-reliability {
+  white-space: nowrap;
+}
+
+td.action-reliability {
+  padding-right: 16px !important;
+}
+
+.action-success-rate {
+  font-size: 0.75em;
+  line-height: 20px;
+  float: right;
+}

data/app/assets/stylesheets/houston/application/layout.scss

@@ -0,0 +1,3 @@
+.nomargin {
+  margin: 0 -20px;
+}

data/app/assets/stylesheets/houston/application/markdown.scss

@@ -1,4 +1,4 @@
-.markdown, .commit, .testing-note, .ticket-description {
+.markdown, .commit, .ticket-description {
   // formatting for markdown, etc within comments, ticket description
   h1 { font-size: 1.5em; font-weight: 200; margin: 0.66em 0 0.33em 0; line-height: 1.18em; }
   h2 { font-size: 1.33em; margin: 0.66em 0 0.33em 0; line-height: 1.42857142857143em; }

data/app/assets/stylesheets/houston/application/navigation.scss

@@ -182,8 +182,10 @@ $current-project-active-bg: #222;
 }
 
 
-.navbar .nav > li.current-user {
+.navbar .nav.pull-right {
   z-index: 5;
+
+  .fa-cog { font-size: 20px; }
 }
 
 .navbar .nav > li.current-user > a {

data/app/assets/stylesheets/houston/application/project_banner_buttons.scss

@@ -22,6 +22,8 @@
     position: relative;
     top: -4px;
 
+    &:focus { text-decoration: none; }
+
     label {
       display: inline-block;
       font-weight: inherit;

data/app/assets/stylesheets/houston/application/tables.scss

@@ -20,7 +20,6 @@ th.vertical {
 
   > span {
     display: block;
-    writing-mode: tb-rl;
     filter: flipv fliph;
     transform: rotate(-90deg);
     -ms-transform: rotate(-90deg); /* IE 9 */

data/app/assets/stylesheets/houston/application/timeline.scss

@@ -137,7 +137,7 @@ $lightGray: #eee;
       font-size: 1.10em;
 
       a { font-weight: 400;
-        b { font-weight: 800; }
+        b { font-weight: 700; }
       }
 
       .bubble {

data/app/assets/stylesheets/houston/core/overrides.scss

@@ -1,6 +1,7 @@
 body {
   padding-bottom: 60px;
-  font-family: "Helvetica Neue", roboto, Helvetica, Arial, sans-serif
+  // a la GitHub
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
 }
 
 li { line-height: 1.5em; }

data/app/concerns/houston/props.rb

@@ -5,15 +5,19 @@ module Houston
     VALID_PROP_NAME = /\A[a-z0-9]+(?:\.[a-z0-9_\-]+)+\Z/i.freeze
 
     def self.valid_prop_name!(prop_name)
-      return if prop_name =~ VALID_PROP_NAME
+      return if valid_prop_name?(prop_name)
       raise ArgumentError, "#{prop_name.inspect} can only contain word-characters, hyphens, and must contain at least one period"
     end
 
+    def self.valid_prop_name?(prop_name)
+      prop_name =~ VALID_PROP_NAME
+    end
+
 
     module ClassMethods
       def with_prop(prop_name, value)
         Houston::Props.valid_prop_name!(prop_name)
-        where(["props->>? = ?", prop_name, value])
+        where(["props->>? = ?", prop_name, value.to_s])
       end
 
       def find_by_prop(prop_name, value)
@@ -85,13 +89,16 @@ module Houston
       end
 
       def respond_to_missing?(method_name, *args)
-        return true if key?(method_name.to_s)
+        prop_name = method_name.to_s.gsub(/_before_type_cast$/, "")
+        return true if key?(prop_name)
+        return true if Houston::Props.valid_prop_name?(prop_name)
         super
       end
 
       def method_missing(method_name, *args, &block)
-        prop_name = method_name.to_s
+        prop_name = method_name.to_s.gsub(/_before_type_cast$/, "")
         return self[prop_name] if key?(prop_name)
+        return nil if Houston::Props.valid_prop_name?(prop_name)
         super
       end
     end

data/app/concerns/project_adapter.rb

@@ -55,7 +55,7 @@ module ProjectAdapter
     end
 
     def define_methods!
-      model.module_eval <<-RUBY
+      model.module_eval <<-RUBY, __FILE__ , __LINE__ + 1
         def self.with_#{attribute_name}
           where arel_table[:#{attribute_name}_name].not_eq("None")
         end

data/app/concerns/unique_add.rb

@@ -1,7 +1,7 @@
 module UniqueAdd
 
   def add(relation)
-    self << relation unless exists?(relation)
+    self << relation unless exists?(relation.id)
   end
 
 end

data/app/controllers/actions_controller.rb

@@ -0,0 +1,39 @@
+class ActionsController < ApplicationController
+
+  def index
+    authorize! :show, :actions
+
+    actions_by_name = Houston.actions.names.each_with_object({}) { |name, map| map[name] = { name: name } }
+    actions = Action.where(name: actions_by_name.keys)
+
+    most_recent_actions = actions.joins(<<-SQL)
+    inner join (select name, max(started_at) "started_at" from actions group by name) "most_recent"
+    on actions.name=most_recent.name and actions.started_at=most_recent.started_at
+    SQL
+    most_recent_actions.each do |action|
+      actions_by_name[action.name][:last] = action
+    end
+
+    actions.group(:name).unscope(:order).pluck(:name, "COUNT(id)", "COUNT(CASE WHEN succeeded THEN 1 ELSE NULL END)", "AVG(EXTRACT(epoch from finished_at - started_at))").each do |name, runs, successful_runs, avg_duration|
+      actions_by_name[name].merge!(
+        runs: runs,
+        successful_runs: successful_runs,
+        avg_duration: avg_duration )
+    end
+
+    @actions = actions_by_name.values
+  end
+
+  def show
+    authorize! :show, :actions
+    @action_name = params[:slug]
+    @actions = Action.where(name: @action_name).preload(:error)
+  end
+
+  def run
+    authorize! :run, :actions
+    Houston.actions.run params[:slug]
+    redirect_to "/actions", notice: "#{params[:slug]} is running"
+  end
+
+end

data/app/controllers/commits_controller.rb

@@ -1,5 +1,5 @@
 class CommitsController < ApplicationController
-  before_filter :api_authenticate!
+  before_filter :api_authenticate!, only: [:index, :self]
 
   def index
     commits = Commit.includes(:releases).includes(:committers).includes(:project)

data/app/controllers/errors_controller.rb

@@ -0,0 +1,10 @@
+class ErrorsController < ApplicationController
+
+  def index
+    authorize! :show, Error
+    @actions = Action.reorder(finished_at: :desc).where.not(error_id: nil).includes(:error).limit(50)
+    @actions = @actions.where(Action.arel_table[:finished_at].lt(params[:before])) if params[:before]
+    render partial: "errors/actions" if request.xhr?
+  end
+
+end

data/app/controllers/hooks_controller.rb

@@ -42,7 +42,7 @@ class HooksController < ApplicationController
       }
     })
 
-    Houston.observer.fire event, payload
+    Houston.observer.fire event, params: payload
     head 200
   end
 

data/app/controllers/omnibar_controller.rb

@@ -41,21 +41,11 @@ class OmnibarController < ApplicationController
         projectColor: project.color,
         title: "Scheduler",
         url: "/scheduler/by_project/#{project.slug}" },
-      { type: "project",
-        projectTitle: project.name,
-        projectColor: project.color,
-        title: "Testing Report",
-        url: "/testing_report/#{project.slug}" },
       { type: "project",
         projectTitle: project.name,
         projectColor: project.color,
         title: "Releases",
-        url: "/projects/#{project.slug}/releases" },
-      { type: "project",
-        projectTitle: project.name,
-        projectColor: project.color,
-        title: "Pretickets",
-        url: "/pretickets/by_project/#{project.slug}" }]
+        url: "/projects/#{project.slug}/releases" }]
     end if filter.member? :project
 
     render json: results

data/app/controllers/project_hooks_controller.rb

@@ -9,7 +9,7 @@ class ProjectHooksController < ApplicationController
       return
     end
 
-    event = "hooks:#{params[:hook]}"
+    event = "hooks:project:#{params[:hook]}"
     unless Houston.observer.observed?(event)
       render text: "A hook with the slug '#{params[:hook]}' is not defined", status: 404
       return
@@ -22,7 +22,7 @@ class ProjectHooksController < ApplicationController
       }
     })
 
-    Houston.observer.fire event, project, payload
+    Houston.observer.fire event, project: project, params: payload
     head 200
   end
 

data/app/controllers/projects_controller.rb

@@ -96,6 +96,8 @@ class ProjectsController < ApplicationController
   def update
     @project = Project.find_by_slug!(params[:id])
 
+    @project.props.merge! project_attributes.delete(:props) if project_attributes.key?(:props)
+
     if @project.update_attributes(project_attributes)
       redirect_to projects_path, notice: 'Project was successfully updated.'
     else