If you've had a pull request reviewed and accepted, congratulations! Before we can merge your changes, we'll need you to rebase off origin/develop and squash your commits into one. This will give us a cleaner git history.
Never done this before? No problem. We'll walk you through it, and you can read a deeper guide about rewriting history to understand more.
On your command line you'll want to do:
git rebase -i origin/develop
| func textFieldDidBeginEditing(textField: UITextField) { | |
| print(textField.tag) | |
| switch textField.tag { | |
| case 0: | |
| if textField.text == "First name" { textField.text = nil } | |
| case 1: | |
| if textField.text == "Last name" { textField.text = nil } | |
| default: | |
| textField.text = nil | |
| } |
| ### What did I get done yesterday? | |
| - Pushed to production | |
| - Assigned all of the design tasks for finishing up product upload | |
| ### What's left for this week and what's my plan for today? | |
| **Reissued** | |
| - [4] Create wireframes `today` | |
| - [4] When a product listing filter has no products, a user should see an empty state | |
| - [2] Write testing document for Cat/Sally/Jenna to QA | |
| - [8] Implement merchant upload design changes from Scotty |
| {:TOTAL=>619142, :FREE=>319189, :T_OBJECT=>12954, :T_CLASS=>9719, :T_MODULE=>1393, :T_FLOAT=>9, :T_STRING=>135036, :T_REGEXP=>2297, :T_ARRAY=>48333, :T_HASH=>11471, :T_STRUCT=>492, :T_BIGNUM=>11, :T_FILE=>14, :T_DATA=>45136, :T_MATCH=>6, :T_COMPLEX=>1, :T_RATIONAL=>889, :T_NODE=>30082, :T_ICLASS=>2110} | |
| {:count=>71, :heap_used=>1519, :heap_length=>2426, :heap_increment=>906, :heap_live_slot=>305930, :heap_free_slot=>313212, :heap_final_slot=>0, :heap_swept_slot=>156288, :heap_eden_page_length=>1135, :heap_tomb_page_length=>384, :total_allocated_object=>3314074, :total_freed_object=>3008144, :malloc_increase=>624, :malloc_limit=>16777216, :minor_gc_count=>34, :major_gc_count=>37, :remembered_shady_object=>8835, :remembered_shady_object_limit=>17670, :old_object=>288401, :old_object_limit=>576802, :oldmalloc_increase=>1008, :oldmalloc_limit=>16777216} | |
| {:TOTAL=>619142, :FREE=>313165, :T_OBJECT=>14333, :T_CLASS=>9719, :T_MODULE=>1393, :T_FLOAT=>9, :T_STRING=>137354, :T_REGEXP=>2298, :T_ARRAY=>49077, :T_HASH=>12864 |
| app.import({ | |
| development: 'vendor/ember-data/ember-data.js', | |
| production: 'vendor/ember-data/ember-data.prod.js' | |
| }, { | |
| exports: { | |
| 'ember-data': [ | |
| 'default' | |
| ] | |
| } | |
| }); |
| { | |
| "skills": [ | |
| { | |
| "id": 1, | |
| "name": "Grilling Chicken", | |
| "earned": true | |
| } | |
| ], | |
| "ingredients": [ | |
| { |
| class Recipe < ActiveRecord::Base | |
| has_many :recipe_skills | |
| has_many :skills, through: :recipe_skills | |
| end | |
| class Skill < ActiveRecord::Base | |
| has_many :recipe_skills | |
| has_many :recipes, through: :recipe_skills | |
| end |