summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into dz-nested-groups-improvemen...dz-nested-groups-improvements-3Dmitriy Zaporozhets2017-02-1411-111/+443
|\
| * Merge branch 'fix-yarn-lock' into 'master' Alfredo Sumaran2017-02-141-101/+238
| |\
| | * Fix yarn lock and package.json mismatch caused by MR 9133Clement Ho2017-02-141-101/+238
| * | Merge branch 'issue_27317' into 'master' Alfredo Sumaran2017-02-142-1/+5
| |\ \
| | * | Fix timezone on issue boards due dateissue_27317Felipe Artur2017-02-142-1/+5
| * | | Merge branch '26287-link-branch-in-calendar-activity' into 'master'Rémy Coutable2017-02-142-5/+13
| |\ \ \ | | |_|/ | |/| |
| | * | Add Links to Branches in Calendar ActivityJan Christophersen2017-02-142-5/+13
| | |/
| * | Merge branch 'fix-yarn-lock-file' into 'master' Filipa Lacerda2017-02-141-3/+129
| |\ \
| | * | sync yarn.lock with recent changes to package.jsonfix-yarn-lock-fileMike Greiling2017-02-141-3/+129
| * | | Merge branch 'cover-my-karma' into 'master' Clement Ho2017-02-146-2/+59
| |\ \ \
| | * | | Include all files with 0% coverage in reportwinniehell2017-02-111-0/+35
| | * | | Reintroduce coverage report for JavaScript (!9133)winniehell2017-02-115-2/+24
* | | | | Merge branch 'master' into 'dz-nested-groups-improvements-3'Dmitriy Zaporozhets2017-02-1474-1906/+5344
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'requires-input-fixture' into 'master' Clement Ho2017-02-143-24/+11
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Replace static fixture for behaviors/requires_input_spec.js (!9162)winniehell2017-02-143-24/+11
| * | | | 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
| |\ \ \ \ \ \ \ \ \ \ \