mikelietz

To [email protected]:nashape/oars.git
 ! [rejected]        delivery -> delivery (non-fast-forward)
 ! [rejected]        dev -> dev (non-fast-forward)
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to '[email protected]:nashape/oars.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again.  See the
'Note about fast-forwards' section of 'git push --help' for details.

mikelietz

[root@localhost] oars/tests/features # git pull origin builder
remote: Counting objects: 306, done.
remote: Compressing objects: 100% (45/45), done.
remote: Total 247 (delta 199), reused 247 (delta 199)
Receiving objects: 100% (247/247), 32.97 KiB, done.
Resolving deltas: 100% (199/199), completed with 33 local objects.
From github.com:nashape/oars
 * branch            builder    -> FETCH_HEAD
Updating 9c73dc2..1d8bf17
Fast-forward

mikelietz

[core]
        repositoryformatversion = 0
        filemode = true
        bare = false
        logallrefupdates = true
[user]
        # name = <username>
        # email = <email>
[remote "origin"]
        fetch = +refs/heads/*:refs/remotes/origin/*

mikelietz

  @test_connection @unit_db @cluster_db @cluster_unit_db @item_db
  Scenario: Visit page to create new unit                                                                                   # ./builder/unit_create.feature:14
    Given there is one cluster named "Cluster 1"                                                                            # step_definitions/webrat_steps.rb:70
    And there is one item in the mongo items collection with the uid "pat-r-c-02-01" and the stem "Amy does not like"       # step_definitions/webrat_steps.rb:91
    And there is one item in the mongo items collection with the uid "pat-r-c-02-03" and the stem "Who likes chicken legs?" # step_definitions/webrat_steps.rb:91
    When I am on the new unit page                                                                                          # step_definitions/webrat_steps.rb:16
    Then I should see "Add New Unit"                                                                                        # step_definitions/webrat_s

mikelietz

#!/usr/bin/env python
import argparse
from ConfigParser import ConfigParser
import os.path
import urllib2
import json
import sys
import base64

def main():

mikelietz

var NerdieInterface = require('nerdie_interface.js')
  , nerdie = null
  , prefix = null
  , config = null;

function Jira_Issue(parentNerdie) {
	config = (parentNerdie.config.plugins.jira_issue) ? parentNerdie.config.plugins.jira_issue : {};
	this.pluginInterface = new NerdieInterface(parentNerdie, this);
	nerdie = parentNerdie;
}

mikelietz

// Format the date field, leaving invalid dates alone
if (strtotime($candidate->dob)) {
  $candidate->dob = date("d/m/Y", strtotime($candidate->dob));
} else if (isnull($candidate->dob)) {
  $candidate->dob = "MM/DD/YYYY";
}

mikelietz

/**
 * CloudSpokes HTML
 * http://dabblet.com/gist/2313854
 */

* { font-family: helvetica,verdana,arial,sans;}

header {
	width: 1000px;
	margin-bottom: 20px;

mikelietz

/**
 * CloudSpokes HTML
 * http://dabblet.com/gist/2313854
 */

* { font-family: helvetica,verdana,arial,sans;}

body {
	width: 1024px;
	margin: 0 auto;

mikelietz

/**
 * The first commented line is your dabblet’s title
 */

background: #f06;
background: linear-gradient(45deg, #f06, yellow);
min-height: 100%;