summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fix overlooked window binding in spec filesremove-imports-loader-window-bindMike Greiling2017-02-1724-24/+24
|
* remove imports loaderMike Greiling2017-02-173-14/+0
|
* replace implicit this == window with explicit bindingMike Greiling2017-02-17105-105/+105
|
* Merge branch 'remove-issue-and-mr-counts-from-labels-page' into 'master' Stan Hu2017-02-172-6/+8
|\ | | | | | | | | | | | | Remove issue and MR counts from label index Closes #25413 See merge request !9332
| * Remove issue and MR counts from labels indexremove-issue-and-mr-counts-from-labels-pageSean McGivern2017-02-172-6/+8
| | | | | | | | | | | | | | | | | | We were performing two (quite slow, because of the need to do access checks) queries for each label on the page: one to get the count of issues with that label, and one to get the count of merge requests with that label. Until we have a performant way of doing this, remove the counts.
* | Update CHANGELOG.md for 8.16.6DJ Mountney2017-02-1712-45/+16
| | | | | | [ci skip]
* | Merge branch 'add-patch-release-changelogs' into 'master' DJ Mountney2017-02-171-0/+8
|\ \ | | | | | | | | | | | | Add patch release changelogs See merge request !9353
| * \ 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
| | | | | | | | | [ci skip]
| * | Update CHANGELOG.md for 8.15.7DJ Mountney2017-02-151-0/+4
| | | | | | | | | [ci skip]
* | | Merge branch 'add-yarn-documentation' into 'master' Clement Ho2017-02-177-29/+75
|\ \ \ | | | | | | | | | | | | | | | | Update documentation to include yarn in our dependencies See merge request !9316
| * | | 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
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (73 commits) fix typo in node section move "Install node modules" step before "Migrate DB" within update process Renders pagination again for pipelines table update migration docs for 8.17 to include minimum node version Add CHANGELOG file Fix positioning of top scroll button add space between ci text and commit sha in Merge Request widget Do not use single quote in headings as it breaks docs.gitlab.com Fix broken test Update services templates docs Simplify Pages admin source docs Simplify Pages admin Omnibus docs Fix error in MR widget after /merge slash command Remove arrow icon from folders Create util to handle pagination transformation Wrap long Project and Group titles Changes after review Changes after review Rename storePagination to setPagination Transforms startTimeAgoLoops into a static method so we can reuse it instead of have 2 ...
| * | | | 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 ↵Mike Greiling2017-02-151-8/+35
| | | | | | | | | | | | | | | | | | | | installation
* | | | | Merge branch 'fix-merge-service-with-no-source' into 'master' Rémy Coutable2017-02-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix merge service error with no source See merge request !9348
| * | | | | Fix merge service error with no sourcefix-merge-service-with-no-sourceSean McGivern2017-02-171-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | This shouldn't be possible in CE, but is needed so that the code is the same in CE and EE.
* | | | | Merge branch 'rc/backport-ee-fix' into 'master' Robert Speicher2017-02-172-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Truncate the DB in after(:all) test for Gitlab::ImportExport::ProjectTreeRestorer See merge request !9339
| * | | | | Truncate the DB in after(:all) test for ↵rc/backport-ee-fixRémy Coutable2017-02-172-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::ImportExport::ProjectTreeRestorer Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch '26379-iid-param' into 'master'Rémy Coutable2017-02-177-27/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add a :iid param to the IssuableFinder Closes #26379 See merge request !9222
| * | | | | | add a :iids param to IssuableFindermhasbini2017-02-177-27/+23
| | | | | | |
* | | | | | | Merge branch 'fix-node-dev-deps' into 'master' Alfredo Sumaran2017-02-172-22/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move frontend dev dependencies out of production dependency list. See merge request !9319
| * | | | | | | use less strict caret ranges now that yarn.lock will take care of locking ↵Mike Greiling2017-02-172-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | our dependencies in place see: https://docs.npmjs.com/misc/semver
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor boards sidebar spec Closes #28310 See merge request !9330
| * | | | | | | | Reduced sidebar wait timeoutboards-sidebar-spec-refactorPhil Hughes2017-02-171-1/+1
| | | | | | | | |
| * | | | | | | | Refactor boards sidebar specPhil Hughes2017-02-171-86/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Uses Timecop to fix due date spec - Waits for sidebar to be visible before doing anything - Fixes weird issues where the link would be clicked instead of the card itself Closes #28310
* | | | | | | | | Merge branch 'fix-dependency-in-environments' into 'master' Clement Ho2017-02-174-6/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix dependencies order in environments Closes #28355 See merge request !9343
| * | | | | | | | Fix depenendencies loading Vue in EEFilipa Lacerda2017-02-174-6/+6
| | | | | | | | |
* | | | | | | | | Merge branch 'gfm-autocomplete-fixes' into 'master' Alfredo Sumaran2017-02-173-2/+63
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fix errors in GFM slash commands matcher See merge request !8975
| * | | | | | | | Fixes errors in GFM slash commands matcher and add tests for default matcherYarNayar2017-02-173-2/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See !8975
* | | | | | | | | Merge branch '28339-npm-jqueryui-ssh' into 'master' Clement Ho2017-02-172-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use http to fetch jQuery-ui dependency instead of ssh Closes #28339 See merge request !9331
| * | | | | | | | | 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 text See merge request !9333
| * | | | | | | | | | 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.md. Insert missing word on line 70. See merge request !9334
View Lorry Controller Status