summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* sync yarn.lock with recent changes to package.jsonfix-yarn-lock-fileMike Greiling2017-02-141-3/+129
* Merge branch 'replace-npm-with-yarn' into 'master' Filipa Lacerda2017-02-146-15/+4345
|\
| * add CHANGELOG.md entry for !9055replace-npm-with-yarnMike Greiling2017-02-141-0/+4
| * fix eslint builds within .gitlab-ci.ymlMike Greiling2017-02-141-2/+2
| * update yarn.lock to reflect latest package.jsonMike Greiling2017-02-131-602/+1016
| * add yarn check to ensure package.json doesn't diverge from yarn.lockMike Greiling2017-02-131-1/+2
| * display yarn version and node version within CI logsMike Greiling2017-02-131-0/+2
| * add yarn lock fileMike Greiling2017-02-131-0/+3914
| * replace npm run calls with yarnMike Greiling2017-02-133-5/+5
| * remove recursive npm calls to avoid dependence on npm after switch to yarnMike Greiling2017-02-131-3/+3
| * remove unnecessary "npm install"sMike Greiling2017-02-131-5/+0
* | Merge branch 'eslint-resolve-webpack-modules' into 'master' Filipa Lacerda2017-02-142-4/+11
|\ \
| * | enable eslint to resolve webpack modules according to webpack.config.jseslint-resolve-webpack-modulesMike Greiling2017-02-142-4/+11
* | | Merge branch 'dynamic-todos-fixture' into 'master' Clement Ho2017-02-145-6/+59
|\ \ \
| * | | Replace static fixture for right_sidebar_spec.js (!9211)winniehell2017-02-145-15/+38
| * | | Add dynamic fixture for todoswinniehell2017-02-141-0/+30
* | | | Merge branch '27755-pipeline-docs' into 'master' Achilleas Pipinellis2017-02-143-0/+30
|\ \ \ \
| * | | | Add image description27755-pipeline-docsMark Pundsack2017-02-101-1/+1
| * | | | Add image titlesMark Pundsack2017-02-061-2/+2
| * | | | Add development workflowsMark Pundsack2017-02-062-1/+17
| * | | | Update imageMark Pundsack2017-02-061-1/+1
| * | | | Add imageMark Pundsack2017-02-062-1/+5
| * | | | Document types of pipelinesMark Pundsack2017-02-061-0/+10
* | | | | Merge branch '19302-wiki-page-delete-does-not-trigger-the-webhook' into 'mast...Rémy Coutable2017-02-1410-2/+146
|\ \ \ \ \
| * | | | | Execute web hooks for WikiPage delete operationMark Fletcher2017-02-145-2/+38
| * | | | | Add tests for WikiPages servicesMark Fletcher2017-02-143-0/+91
| * | | | | Make WikiPage comparable according to StaticModel interfaceMark Fletcher2017-02-142-0/+17
* | | | | | Merge branch '23061-consolidate-project-lists' into 'master' Sean McGivern2017-02-149-396/+146
|\ \ \ \ \ \
| * | | | | | API: Consolidate /projects endpointToon Claes2017-02-149-396/+146
* | | | | | | Merge branch '27656-doc-ci-enable-ci' into 'master' Achilleas Pipinellis2017-02-144-9/+13
|\ \ \ \ \ \ \
| * | | | | | | Update doc for enabling or disabling GitLab CITakuya Noguchi2017-02-054-9/+13
* | | | | | | | Merge branch '26286-most-recent-activity-profile-header' into 'master' Annabel Dunstone Gray2017-02-142-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Add 'Most Recent Activity' header to the User Profile pageJan Christophersen2017-02-132-0/+6
* | | | | | | | | Merge branch 'use-es6-promise-package' into 'master' Alfredo Sumaran2017-02-143-1158/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use es6-promise package to avoid webpack warningsuse-es6-promise-packageEric Eastwood2017-02-133-1158/+2
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch '27932-merge-request-pipelines-displays-json' into 'master' Alfredo Sumaran2017-02-143-1/+23
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into 27932-merge-request-pipelines-displays-json27932-merge-request-pipelines-displays-jsonFilipa Lacerda2017-02-1029-245/+125
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Adds verification in case the endpoint already has `.json`Filipa Lacerda2017-02-102-2/+20
| * | | | | | | | | | Merge branch 'master' into 27932-merge-request-pipelines-displays-jsonFilipa Lacerda2017-02-1048-129/+418
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 27932-merge-request-pipelines-displays-jsonFilipa Lacerda2017-02-107-8/+31
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 27932-merge-request-pipelines-displays-jsonFilipa Lacerda2017-02-109-13/+35
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 27932-merge-request-pipelines-displays-jsonFilipa Lacerda2017-02-1070-411/+404
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Adds `.json` to the endpoint requested in order to avoid showing JSONFilipa Lacerda2017-02-092-1/+5
* | | | | | | | | | | | | | | Merge branch '27924-set-max-width-mini-pipeline-text' into 'master' Filipa Lacerda2017-02-142-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Set max width for text in mini pipeline graph27924-set-max-width-mini-pipeline-textSam Rose2017-02-142-1/+5
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'remove-inactive-default-email-services' into 'master' Lin Jen-Shin (godfat)2017-02-142-0/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Use Gitlab::Database.with_connection_pool from !9192remove-inactive-default-email-servicesLin Jen-Shin2017-02-142-41/+24
| * | | | | | | | | | | | | | Disconnect the pool after doneLin Jen-Shin2017-02-141-0/+1
| * | | | | | | | | | | | | | Use threads directly, introduce pool later:Lin Jen-Shin2017-02-142-53/+33
| * | | | | | | | | | | | | | Revert "Bump schema to pass `rake db:setup`"Lin Jen-Shin2017-02-141-1/+1
View Lorry Controller Status