jfo

commit e16492db439ebd83129d099d0fea1e9ae5f6e0c7
Author: Jeff Fowler <jeff.fowler@peakon.com>
Date:   Wed Jan 31 14:37:05 2018 +0100

    attributeAliases feature cleanup

diff --git a/assets/apps/main/employees/segments/components/employeeSegmentForm/employeeSegmentForm.html b/assets/apps/main/employees/segments/components/employeeSegmentForm/employeeSegmentForm.html
index b13c0dcc7..b9ae18ced 100644
--- a/assets/apps/main/employees/segments/components/employeeSegmentForm/employeeSegmentForm.html
+++ b/assets/apps/main/employees/segments/components/employeeSegmentForm/employeeSegmentForm.html

jfo

'use strict';

const models = require('../../models');
const harness = require('../harness');
const jfo = require('jfo');

const initechCompanyId = 3;

describe('testpls The company settings model', function () {
  harness.transactions.start();

jfo

diff --git a/assets/apps/main/dashboard/components/dashboardDataSettings/dashboardDataSettings.scss b/assets/apps/main/dashboard/components/dashboardDataSettings/dashboardDataSettings.scss
index 1be1b4b17..b89b78e11 100644
--- a/assets/apps/main/dashboard/components/dashboardDataSettings/dashboardDataSettings.scss
+++ b/assets/apps/main/dashboard/components/dashboardDataSettings/dashboardDataSettings.scss
@@ -1,5 +1,9 @@
 @import "stylesheets/settings";
 
+* {
+  background-color: hotpink;
+}

jfo

diff --git a/www/index.html b/www/index.html
index d2a7c16..4678e9f 100644
--- a/www/index.html
+++ b/www/index.html
@@ -6,13 +6,22 @@
     <title>The Zig Programming Language</title>
     <link rel="stylesheet" type="text/css" href="highlight/styles/default.css">
     <style type="text/css">
-      img {
-          max-width: 100%;

jfo

diff --git a/Formula/zig.rb b/Formula/zig.rb
index 42ce4f54..758d9617 100644
--- a/Formula/zig.rb
+++ b/Formula/zig.rb
@@ -8,10 +8,8 @@ class Zig < Formula
   depends_on "llvm"
 
   def install
-    mkdir "build" do
-      system "cmake", "..", *std_cmake_args

jfo

#!/usr/bin/env bash

# for demo, just assume the destination branch is `dest`

DESTINATION_BRANCH=dest

# after `git add -p` or whatever,
# create a tree object from the staged changes

FIRST_TREE_HASH=`git write-tree`

jfo

# for demo, just assume the destination branch is `dest`
DESTINATION_BRANCH=dest

# create a tree object from the staged changes
FIRST_TREE_HASH=`git write-tree`

# get the destination branch's head commit (probably a better way to do this)
DEST_BRANCH_COMMIT=`git log $DESTINATION_BRANCH -1 --pretty=format:"%H"`

# which returns a hash which you can use to create a commit object.

jfo

# for demo, just assume the destination branch is `dest`
DESTINATION_BRANCH=dest

# create a tree object from the staged changes
FIRST_TREE_HASH=`git write-tree`

# get the destination branch's head commit (probably a better way to do this)
DEST_BRANCH_COMMIT=`git log $DESTINATION_BRANCH -1 --pretty=format:"%H"`

# which returns a hash which you can use to create a commit object.

jfo

diff --git a/models/attribute_model.js b/models/attribute_model.js
index 63b7eb89c..6aa9a9dd2 100644
--- a/models/attribute_model.js
+++ b/models/attribute_model.js
@@ -57,8 +57,14 @@ module.exports = function (sequelize, DataTypes) {
     },
     aliases: {
       type: DataTypes.ARRAY(DataTypes.STRING(256)),
-      defaultValue: [],
-      allowNull: false

jfo

diff --git a/locales/en.json b/locales/en.json
index dc94416ed..b3eca59b7 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -387,5 +387,10 @@
   "Cannot benchmark against the same segment": "Cannot benchmark against the same segment",
   "You are part of multiple organisations. Specify an organisation to login.": "You are part of multiple organisations. Specify an organisation to login.",
   "A schedule already exists for %s": "A schedule already exists for %s",
-  "Unsupported file type %s": "Unsupported file type %s"
+  "Unsupported file type %s": "Unsupported file type %s",