Skip to content

Instantly share code, notes, and snippets.

View Kjir's full-sized avatar

Stéphane Bisinger Kjir

View GitHub Profile
{
"meta": {
"theme": "kwan"
},
"basics": {
"name": "Stéphane Bisinger",
"label": "Software Engineer",
"email": "stephane@sbisinger.ch",
"website": "https://www.sbisinger.ch",
"phone": "+41 79 635 2861",
@Kjir
Kjir / gist:8b3ad2e5d074fcf3b1459a18efd9fab6
Last active September 25, 2018 19:05
git rebase conflict on unrelated file
$ git --version
git version 2.19.0
$ git log --graph --oneline my-feat-2 master -6
* 4ce0262 (HEAD -> my-feat-2) SNS-558 chore: add sentry middleware to createSearchInquiry
| * dff2b2a (origin/master, origin/HEAD, master) Merge pull request #199 in HOM/sns from bugfix/same-recipient-for-e2e-test-makes-test-unstable to master
| * 06961b0 Merge pull request #196 in HOM/sns from bugfix/SNS-600-problems-removing-search-inquiries-from-Elastic-Search to master
| * 7dd576f Merge pull request #198 in HOM/sns from feature/SNS-584-saving-inactive-email-search-inquiry to master
|/
* 57eea5d Merge pull request #193 in HOM/sns from feature/SNS-571-add-component-test-to-match-listings to master
@Kjir
Kjir / subscriber_controller_test.exs
Last active January 7, 2017 17:12
First Phoenix API test
defmodule Quotes.SubscriberControllerTest do
use Quotes.ConnCase
import Quotes.Factory
test "#index renders a list of subscribers" do
conn = build_conn()
subscriber = insert(:subscriber)
conn = get conn, subscriber_path(conn, :index)
@Kjir
Kjir / Fetch data before loading angular app.markdown
Created July 14, 2016 17:19
Fetch data before loading angular app
@Kjir
Kjir / index.html
Created February 24, 2016 13:34
$q.all not working exactly as I expected...
<!DOCTYPE html>
<html>
<head>
<script data-require="angular.js@1.5.0" data-semver="1.5.0" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0/angular.js"></script>
<link rel="stylesheet" href="style.css" />
<script src="script.js"></script>
</head>
<body ng-app="qall1">