summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Refactor and copyedit "Using Docker images" docsdocs/extended-docker-syntax-in-ci-ymlAchilleas Pipinellis2017-07-031-135/+150
|
* Update syntax description to new syntax introduced in !12536.Tomasz Maczukin2017-07-031-10/+15
|
* Add documentation for extended docker configuration options for CITomasz Maczukin2017-07-031-0/+176
|
* Merge branch 'patch-24' into 'master'Rémy Coutable2017-07-031-1/+1
|\ | | | | | | | | Fixed typo in gitlab_flow.md See merge request !12561
| * Fixed typo in gitlab_flow.mdleungpeng2017-06-291-1/+1
| |
* | Merge branch '23036-replace-dashboard-new-project-spinach' into 'master'Rémy Coutable2017-07-036-128/+85
|\ \ | | | | | | | | | | | | Replaces 'dashboard/new-project.feature' spinach with rspec See merge request !12550
| * | Replaces 'dashboard/new-project.feature' spinach with rspecAlexander Randa2017-06-296-128/+85
| | |
* | | Merge branch '34609-fix-lazy-create-milestone-in-spec' into 'master'Sean McGivern2017-07-031-6/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Eagerly create a milestone that is used in a feature spec Closes #34609 See merge request !12604
| * | | Eagerly create a milestone that is used in a feature specRémy Coutable2017-07-031-6/+6
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'docs-fix-branch-api-examples' into 'master'Rémy Coutable2017-07-031-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix curl example paths (missing the 'files' segment) See merge request !12588
| * | | | Fix curl example paths (missing the 'files' segment)Joe Marty2017-06-301-3/+3
| | | | |
* | | | | Merge branch '34116-milestone-filtering-on-group-issues' into 'master'Sean McGivern2017-07-035-0/+60
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Use correct milestones for filtering on Group Issues Closes #34116 See merge request !12374
| * | | | Change milestone endpoint for groupsTakuya Noguchi2017-06-272-0/+6
| | | | |
| * | | | Add JSON support to group milestonesTakuya Noguchi2017-06-271-0/+3
| | | | |
| * | | | Add tests for Groups::MilestonesController#indexTakuya Noguchi2017-06-261-0/+15
| | | | |
| * | | | Add tests for MilestonesHelper#milestones_filter_dropdown_pathTakuya Noguchi2017-06-261-0/+36
| | | | |
* | | | | Merge branch 'dz-improve-codeclimate-json-cleanup' into 'master'Kamil Trzciński2017-07-031-2/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary pull command from codeclimate job See merge request !12583
| * | | | | Remove unnecessary pull command from codeclimate jobdz-improve-codeclimate-json-cleanupDmitriy Zaporozhets2017-06-301-2/+0
| | | | | |
* | | | | | Merge branch 'adjust-readme-repo-width' into 'master'Phil Hughes2017-07-034-6/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust readme repo width See merge request !12585
| * | | | | | Adjust readme repo widthDimitrie Hoekstra2017-07-034-6/+11
|/ / / / / /
* | | | | | Merge branch '34525-backport-update-go-to-91-92-guide' into 'master'Sean McGivern2017-07-032-16/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make clear that Go 1.8 is required since GitLab 9.2 Closes #34525 See merge request !12564
| * | | | | | Make clear that Go 1.8 is required since GitLab 9.234525-backport-update-go-to-91-92-guideRémy Coutable2017-06-292-16/+34
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'fix-performance_bar-specs' into 'master'Sean McGivern2017-07-031-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix performance bar specs See merge request !12225
| * | | | | | Fix the performance bar spec that was not asserting the right thingfix-performance_bar-specsRémy Coutable2017-06-291-3/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch ↵Phil Hughes2017-07-035-4/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34097-issue-board-remove-from-board-button-when-viewing-an-issue-gives-js-error-and-fails' into 'master' Resolve "Issue Board -> "Remove from board" button when viewing an issue gives js error and fails" Closes #34097 See merge request !12430
| * | | | | | Resolve "Issue Board -> "Remove from board" button when viewing an issue ↵Luke "Jared" Bennett2017-07-035-4/+27
|/ / / / / / | | | | | | | | | | | | | | | | | | gives js error and fails"
* | | | | | Merge branch 'set-sidebar-height' into 'master'Tim Zallmann2017-07-023-46/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make issuable sidebar setSidebarHeight more efficient See merge request !12252
| * | | | | | Make setSidebarHeight more efficient with SidebarHeightManager.set-sidebar-heightBryce Johnson2017-06-303-46/+38
| | | | | | |
* | | | | | | Merge branch 'change-extended-docker-configuration-syntax' into 'master'Grzegorz Bizon2017-07-025-16/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make entrypoint and command keys to be array of strings See merge request !12536
| * | | | | | | Fix rubocop offenseschange-extended-docker-configuration-syntaxTomasz Maczukin2017-07-023-6/+6
| | | | | | | |
| * | | | | | | Make entrypoint and command keys to be array of stringsTomasz Maczukin2017-07-025-16/+25
| | | | | | | |
* | | | | | | | Merge branch 'enable-webpack-code-splitting' into 'master'Jacob Schatz2017-06-3015-69/+137
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable webpack code splitting Closes #32989 See merge request !12032
| * | | | | | | | add CHANGELOG.md entry for !12032Mike Greiling2017-06-291-0/+5
| | | | | | | | |
| * | | | | | | | configure webpack publicPath dynamically to account for CDN or relative path ↵Mike Greiling2017-06-283-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings
| * | | | | | | | move webpack publicPath setup earlier in the bootstrap processes to avoid ES ↵Mike Greiling2017-06-284-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | module execution order issues
| * | | | | | | | dynamically import emoji helpers for gl-emoji custom tag prototypeMike Greiling2017-06-281-5/+12
| | | | | | | | |
| * | | | | | | | dynamically import emoji helpers for GfmAutoComplete classMike Greiling2017-06-281-6/+12
| | | | | | | | |
| * | | | | | | | dynamically import emoji helpers for AwardsHandler classMike Greiling2017-06-284-47/+61
| | | | | | | | |
| * | | | | | | | dynamically set webpack publicPath when relative_url_root enabledMike Greiling2017-06-282-1/+8
| | | | | | | | |
| * | | | | | | | ensure eslint recognizes es2015 dynamic import() syntaxMike Greiling2017-06-283-1/+16
| | | | | | | | |
* | | | | | | | | Merge branch 'fix-assigned-issuable-lists' into 'master'Annabel Dunstone Gray2017-06-303-2/+7
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Add issuable-list class to shared mr/issue lists to fix new responsive layout See merge request !12591
| * | | | | | | | Add issuable-list class to shared mr/issue lists to fix new responsive layoutfix-assigned-issuable-liststauriedavis2017-06-303-2/+7
| | | | | | | | |
* | | | | | | | | Merge branch 'winh-issue-show-aftereach' into 'master'Clement Ho2017-06-301-3/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove empty afterEach() from issue_show app_spec.js See merge request !12577
| * | | | | | | | | Remove empty afterEach() from issue_show app_spec.jswinh-issue-show-aftereachWinnie Hellmann2017-06-291-3/+0
| | | | | | | | | |
* | | | | | | | | | Merge branch 'restore-timeago-translation' into 'master'Phil Hughes2017-06-301-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore timeago translations in renderTimeago. See merge request !12590
| * | | | | | | | | | Restore timeago translations in renderTimeago.restore-timeago-translationBryce Johnson2017-06-301-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'experimental-breadcrumbs' into 'master'Annabel Dunstone Gray2017-06-3019-36/+232
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New navigation breadcrumbs Closes #34029 See merge request !12346
| * | | | | | | | | New navigation breadcrumbsPhil Hughes2017-06-3019-36/+232
|/ / / / / / / / /
* | | | | | | | | Merge branch 'bpj-init-timeago-timeout-less-frequently' into 'master'Phil Hughes2017-06-302-22/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove initTimeagoTimeout and let timeago.js update timeagos internally. Closes #34340 See merge request !12468
| * | | | | | | | | Remove initTimeagoTimeout and let timeago.js update timeagos internally.bpj-init-timeago-timeout-less-frequentlyBryce Johnson2017-06-292-22/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MR: !12468