bryanbraun

Example Git Branching Diagram

You can use this diagram as a template to create your own git branching diagrams. Here's how:

1. Create a new diagram with diagrams.net (formerly draw.io)
2. Go to File > Open From > URL
3. Insert this url (it points to the xml data below): https://gist.githubusercontent.com/bryanbraun/8c93e154a93a08794291df1fcdce6918/raw/bf563eb36c3623bb9e7e1faae349c5da802f9fed/template-data.xml
4. Customize as needed for your team.

---

bryanbraun

+==============================================================================+
| Test Env. |   Driver    | Test Runner | Test Framework | Syntax | Assertions |
+==============================================================================+
|  Phantom  | Poltergeist |                     Capybara                       | Ruby
+------------------------------------------------------------------------------+
|  Chrome   |         Karma             |             Jasmine                  | JS
+------------------------------------------------------------------------------+
|  Slimer   |                        CasperJS                                  | JS
+------------------------------------------------------------------------------+

bryanbraun

# Edit the .git/config file in your local repo like so:
#   cd <path/to/project>
#   vim .git/config
# (include the lines below)

[remote "origin"]
    url = https://github.com/bryanbraun/anchorjs.git
    fetch = +refs/heads/*:refs/remotes/origin/*
    fetch = +refs/pull/*/head:refs/pull/origin/*

bryanbraun

#!../vendor/bin/drush

// <?php
// ^^^ For syntax highlighters only
//
// This is a drush shell script, designed to help debug and reset post_update
// hooks. For details, see: http://www.drush.org/en/master/shellscripts/

$key_value = \Drupal::keyValue('post_update');
$update_list = $key_value->get('existing_updates');

bryanbraun

# See how variables work, and a list of predefined ones:
#  - https://docs.gitlab.com/ce/ci/variables/
variables:
  RAILS_IMAGE: registry.gitlab.com/bryanbraun/gridmaster.io/railsapp:$CI_COMMIT_SHA
  NGINX_IMAGE: registry.gitlab.com/bryanbraun/gridmaster.io/nginx:$CI_COMMIT_SHA
  DEPLOY_TAG: $CI_COMMIT_SHA

cache:
  paths:
  - vendor/ruby

bryanbraun

export class Store {
  constructor(initialState) {
    this.events = {};
    this.state = initialState || {};
  }

  /**
   * setState works like a simplified version of lodash's _.set(),
   * only it sets this.state instead of an arbitrary object.
   *

bryanbraun

// Tic Tac Term!
//
// A 2-player Tic Tac Toe game, played in the terminal
// (written in JavaScript 💪)


// Set up user prompt interface.
const rl = require("readline").createInterface({
  input: process.stdin,
  output: process.stdout

bryanbraun

language: node_js
node_js:
  - "node"
branches:
  only:
    - master

bryanbraun

# app.rb

require "sinatra"
require "sinatra/activerecord"
require 'rest-client'
require 'json'
require 'octokit'
require 'pp' # for pretty print debugging

# Needed for preserving github auth tokens across sessions.

bryanbraun

Links:

• The Juice Shop Application Repo: https://github.com/bkimminich/juice-shop
• OWASP Top 10 Security Risks (2017): https://www.owasp.org/index.php/Top_10_2017-Top_10

Our Example Application:

• https://owasp-juice-shop.herokuapp.com/#/search

Hints and Solutions: