summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix grammer issue in admin/runners28353-little-grammar-issueClement Ho2017-02-173-2/+6
* Update CHANGELOG.md for 8.16.6DJ Mountney2017-02-1712-45/+16
* Merge branch 'add-patch-release-changelogs' into 'master' DJ Mountney2017-02-171-0/+8
|\
| * Merge remote-tracking branch 'dev/master' into add-patch-release-changelogsDJ Mountney2017-02-171-0/+8
| |\ |/ /
| * Update CHANGELOG.md for 8.14.10DJ Mountney2017-02-151-0/+4
| * Update CHANGELOG.md for 8.15.7DJ Mountney2017-02-151-0/+4
* | Merge branch 'add-yarn-documentation' into 'master' Clement Ho2017-02-177-29/+75
|\ \
| * | correct gitlab version that started requiring yarnadd-yarn-documentationMike Greiling2017-02-171-3/+4
| * | pluralize "this step"Mike Greiling2017-02-171-1/+1
| * | add CHANGELOG.md entry for !9316Mike Greiling2017-02-161-0/+4
| * | Merge branch 'master' into add-yarn-documentationMike Greiling2017-02-16128-1930/+2803
| |\ \
| * | | revert changes to 8.17 update docs since yarn is now set for 9.0Mike Greiling2017-02-161-35/+8
| * | | use NODE_ENV=production when compiling assets in upgrader scriptMike Greiling2017-02-161-1/+4
| * | | do not use --force command argument for yarnMike Greiling2017-02-163-3/+3
| * | | add yarn:install to upgrader scriptMike Greiling2017-02-161-1/+1
| * | | add yarn command to install from source instructionsMike Greiling2017-02-161-0/+1
| * | | update yarn commandMike Greiling2017-02-161-1/+1
| * | | update rake command for assets compilationMike Greiling2017-02-151-1/+1
| * | | update install from source directions to mention nodejs and yarn requirementsMike Greiling2017-02-151-6/+23
| * | | preserve trailing space newlines in markdown fileMike Greiling2017-02-150-0/+0
| * | | simplify eslint rake taskMike Greiling2017-02-151-2/+2
| * | | ensure rake tasks produce helpful error messages for node dependency issuesMike Greiling2017-02-154-21/+57
| * | | update migration docs for 8.17 to include minimum node version and yarn insta...Mike Greiling2017-02-151-8/+35
* | | | Merge branch 'fix-merge-service-with-no-source' into 'master' Rémy Coutable2017-02-171-1/+1
|\ \ \ \
| * | | | Fix merge service error with no sourcefix-merge-service-with-no-sourceSean McGivern2017-02-171-1/+1
* | | | | Merge branch 'rc/backport-ee-fix' into 'master' Robert Speicher2017-02-172-5/+5
|\ \ \ \ \
| * | | | | Truncate the DB in after(:all) test for Gitlab::ImportExport::ProjectTreeRest...rc/backport-ee-fixRémy Coutable2017-02-172-5/+5
* | | | | | Merge branch '26379-iid-param' into 'master'Rémy Coutable2017-02-177-27/+23
|\ \ \ \ \ \
| * | | | | | add a :iids param to IssuableFindermhasbini2017-02-177-27/+23
* | | | | | | Merge branch 'fix-node-dev-deps' into 'master' Alfredo Sumaran2017-02-172-22/+22
|\ \ \ \ \ \ \
| * | | | | | | use less strict caret ranges now that yarn.lock will take care of locking our...Mike Greiling2017-02-172-18/+18
| * | | | | | | move webpack-dev-server and karma-mocha-reporter to devDependenciesMike Greiling2017-02-171-4/+4
* | | | | | | | Merge branch 'boards-sidebar-spec-refactor' into 'master' Rémy Coutable2017-02-171-86/+53
|\ \ \ \ \ \ \ \
| * | | | | | | | Reduced sidebar wait timeoutboards-sidebar-spec-refactorPhil Hughes2017-02-171-1/+1
| * | | | | | | | Refactor boards sidebar specPhil Hughes2017-02-171-86/+53
* | | | | | | | | Merge branch 'fix-dependency-in-environments' into 'master' Clement Ho2017-02-174-6/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Fix depenendencies loading Vue in EEFilipa Lacerda2017-02-174-6/+6
* | | | | | | | | Merge branch 'gfm-autocomplete-fixes' into 'master' Alfredo Sumaran2017-02-173-2/+63
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Fixes errors in GFM slash commands matcher and add tests for default matcherYarNayar2017-02-173-2/+63
* | | | | | | | | Merge branch '28339-npm-jqueryui-ssh' into 'master' Clement Ho2017-02-172-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | update yarn resolution for jquery-uiMike Greiling2017-02-171-1/+1
| * | | | | | | | | Update lock file28339-npm-jqueryui-sshFilipa Lacerda2017-02-171-1/+1
| * | | | | | | | | use http to feth jquery-ui dependency instead of sshFilipa Lacerda2017-02-171-1/+1
* | | | | | | | | | Merge branch 'zero-for-unlimited' into 'master' Annabel Dunstone Gray2017-02-171-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | changed minor inconsistency in help textzero-for-unlimiteddimitrieh2017-02-171-2/+2
* | | | | | | | | | | Merge branch 'patch-14' into 'master'Rémy Coutable2017-02-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update gitlab_flow.mdMark Bowman2017-02-171-1/+1
* | | | | | | | | | | | Merge branch 'dynamic-project-title-fixture' into 'master' Clement Ho2017-02-173-31/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Replace static fixture for project_title_spec.js (!9175)winniehell2017-02-133-31/+12
* | | | | | | | | | | | Merge branch 'document-ce-to-ee' into 'master' Robert Speicher2017-02-172-17/+26
|\ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status