I hereby claim:
- I am olivierlacan on github.
- I am olivierlacan (https://keybase.io/olivierlacan) on keybase.
- I have a public key whose fingerprint is 657E 4315 B9D1 4DA4 EC57 152C 8AF8 9C6A 1FF9 AF6D
To claim this, I am signing this object:
| # located in lib/pumper/nickel.rb | |
| # the only way Back.setup works inside of #add_crappy_music | |
| # is if I add the following: | |
| # require "pumper/nickel/back" | |
| # | |
| # Why? | |
| module Pumper | |
| class Nickel < ActiveRecord::Base | |
| def add_crappy_music |
I hereby claim:
To claim this, I am signing this object:
| diff --git i/hash.c w/hash.c | |
| index 007508a..6f39e47 100644 | |
| --- i/hash.c | |
| +++ w/hash.c | |
| @@ -2402,6 +2402,28 @@ rb_hash_flatten(int argc, VALUE *argv, VALUE hash) | |
| return ary; | |
| } | |
| +static int | |
| +hash_contain_i(VALUE key, VALUE value, VALUE arg) |
| # Public: Matcher for asserting specific merge vars content contains something. | |
| # | |
| # merge_var_key - Key of the merge var whose content will be checked | |
| # expected_data - Data to look for in the specified merge var key. | |
| # | |
| # WelcomeMailer is an instance of MandrillMailler::TemplateMailer | |
| # | |
| # let(:user) { FactoryGirl.create(:user) } | |
| # let(:mailer) { WelcomeMailer.welcome_registered(user) } | |
| # it 'should have the correct data' do |
| diff --git i/hash.c w/hash.c | |
| index 007508a..6f39e47 100644 | |
| --- i/hash.c | |
| +++ w/hash.c | |
| @@ -2402,6 +2402,28 @@ rb_hash_flatten(int argc, VALUE *argv, VALUE hash) | |
| return ary; | |
| } | |
| +static int | |
| +hash_comprised_i(VALUE key, VALUE value, VALUE arg) |
| -----> Fetching custom tar buildpack... done | |
| -----> Ruby app detected | |
| -----> Compiling Ruby/Rails | |
| ! | |
| ! Command: 'set -o pipefail; curl --fail --retry 3 --retry-delay 1 --connect-timeout 3 --max-time 20 https://s3-external-1.amazonaws.com/heroku-buildpack-ruby/ruby-2.2.0.tgz -s -o - | tar zxf -' failed unexpectedly: | |
| ! | |
| ! gzip: stdin: unexpected end of file | |
| ! tar: Child returned status 1 | |
| ! tar: Exiting with failure status due to previous errors | |
| ! |
| require 'vandamme' | |
| module PagesHelper | |
| def changes | |
| changes = {} | |
| sections = changelog_file.each_with_index do |day, index| | |
| change_sets = {} | |
| day[1].scan(section_title_scanner) do |match| |
| # Defines a method returning the selector for a CSS selector | |
| # used within the test suite to scope a feature spec. | |
| # | |
| # Developers: always use these instead of hard-coding CSS selectors | |
| # when scoping or selecting crucial elements on a page. | |
| # Designers: always check this module before/after modifying existing | |
| # classes or IDs that may cause test failures | |
| # | |
| # Example usage: | |
| # - page.should have_selector(CSS.some_method) |
Howdy,
It's currently a bit of a hassle (unless I'm doing it wrong) to fix a PR that used to be green but is now unmergeable due to an simple little merge conflict with master.
It would be quite fantabulous if I could access the swanky invisible PR branches from the web interface in order to quickly fix the merge conflict and merge/close the PR without having to:
A dream solution that would make GitHub even more addictive would be an interactive conflict resolutio