summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge branch '38016-fix-bad-link-on-gitlab-omnibus-helm-chart-page-docs' ↵Achilleas Pipinellis2017-09-221-15/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix bad link on GitLab Omnibus Helm chart page - docs Closes #38016 See merge request gitlab-org/gitlab-ce!14346
| * | | | | | | | | | Fix link, resolve inconsistent examples38016-fix-bad-link-on-gitlab-omnibus-helm-chart-page-docsJoshua Lambert2017-09-181-15/+3
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'backport-ee-2983' into 'master'Rémy Coutable2017-09-221-6/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify a test See merge request gitlab-org/gitlab-ce!14415
| * | | | | | | | | | Simplify a testNick Thomas2017-09-211-6/+1
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '36231-better-svg-usage-in-the-frontend' into 'master'Phil Hughes2017-09-2274-280/+3885
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Better SVG Usage in the Frontend" Closes #36231 See merge request gitlab-org/gitlab-ce!13435
| * | | | | | | | | | Resolve "Better SVG Usage in the Frontend"Tim Zallmann2017-09-2274-280/+3885
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'add-view-replaced-file-link' into 'master'Rémy Coutable2017-09-226-12/+53
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add view replaced file link for image diffs See merge request gitlab-org/gitlab-ce!14394
| * | | | | | | | | | Add view replaced file link for image diffsadd-view-replaced-file-linkClement Ho2017-09-206-12/+53
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'docs/fix-review-docs-cleanup-job' into 'master'Rémy Coutable2017-09-221-3/+12
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not clone the repo when running the review-docs jobs See merge request gitlab-org/gitlab-ce!14420
| * | | | | | | | | | Do not clone the repo when running the review-docs jobsdocs/fix-review-docs-cleanup-jobAchilleas Pipinellis2017-09-211-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we checked out the branch and ran the script from there. However, when the MR got merged and the cleanup job was run it would fail since it could not find the now deleted branch. This commit rather downloads the script from GitLab and skips downloading the artifacts/dependencies/cache to speed up the process.
* | | | | | | | | | | Merge branch 'replace_project_service.feature' into 'master'Rémy Coutable2017-09-2219-338/+347
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the 'project/service.feature' spinach test with an rspec analog Closes #23036 See merge request gitlab-org/gitlab-ce!14432
| * | | | | | | | | | | Replace the 'project/service.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-2219-338/+347
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'voogsgerd/gitlab-ce-daniel-legacy-config' into 'master'Rémy Coutable2017-09-222-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed two legacy config options See merge request gitlab-org/gitlab-ce!14425
| * | | | | | | | | | | | Removed two legacy config optionsvoogsgerd/gitlab-ce-daniel-legacy-configDaniel Voogsgerd2017-09-212-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the max_size and timeout options from the git config in gitlab.yml.
* | | | | | | | | | | | | Merge branch 'fix-multi-line-hook-output' into 'master'Rémy Coutable2017-09-223-4/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display full pre-receive and post-receive hook output in GitLab UI Closes #25214 See merge request gitlab-org/gitlab-ce!14222
| * | | | | | | | | | | | Display full pre-receive and post-receive hook output in GitLab UIRobin Bobbitt2017-09-213-4/+11
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'acet-fix-double-note-render' into 'master'Jacob Schatz2017-09-225-19/+47
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix rendering double note issue Closes #38139 See merge request gitlab-org/gitlab-ce!14429
| * | | | | | | | | | | Fix rendering double note issue.Fatih Acet2017-09-225-19/+47
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'acet-switch-markdown-pane' into 'master'Jacob Schatz2017-09-221-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IssueNotes: Switch back to Write pane when note cancel or submit. Closes #37907 See merge request gitlab-org/gitlab-ce!14402
| * | | | | | | | | | IssueNotes: Switch back to Write pane when note cancel or submit.acet-switch-markdown-paneFatih Acet2017-09-221-1/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'winh-upgrade-nokogiri' into 'master'Robert Speicher2017-09-212-5/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Nokogiri because of CVE-2017-9050 See merge request gitlab-org/gitlab-ce!14427
| * | | | | | | | | | Upgrade Nokogiri because of CVE-2017-9050winh-upgrade-nokogiriWinnie Hellmann2017-09-212-5/+5
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'acet-fix-comment-form-resize' into 'master'Jacob Schatz2017-09-212-0/+22
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IssueNotes: Resize comment form after note submit and discard. Closes #38115 See merge request gitlab-org/gitlab-ce!14401
| * | | | | | | | | | IssueNotes: Resize comment form after note submit and discard.acet-fix-comment-form-resizeFatih Acet2017-09-212-0/+22
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'tc-bump-version-10.1-pre' into 'master'Robert Speicher2017-09-211-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump VERSION to 10.1.0-pre [ci skip] See merge request gitlab-org/gitlab-ce!14426
| * | | | | | | | | Bump VERSION to 10.1.0-preToon Claes2017-09-211-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'cache-csrf-token' into 'master'Phil Hughes2017-09-215-12/+112
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Standardize access to CSRF token in JavaScript Closes #37773 See merge request gitlab-org/gitlab-ce!14241
| * | | | | | | | | Standardize access to CSRF token in JavaScriptBryce Johnson2017-09-215-12/+112
|/ / / / / / / / /
* | | | | | | | | Merge branch 'hide-frontmatter-help-page' into 'master'Robert Speicher2017-09-211-2/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not show YAML frontmatter for doc pages under /help See merge request gitlab-org/gitlab-ce!14345
| * | | | | | | | | Do not show YAML frontmatter for doc pages under /helpAchilleas Pipinellis2017-09-191-2/+8
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We recently started adding YAML frontmatter in docs so that we can show more information, but that only works for the docs portal at docs.gitlab.com. For example, we want to add a last_updated entry https://gitlab.com/gitlab-org/gitlab-ce/issues/37677 Whereas this is useful for the docs portal, it looks ugly for docs under /help.
* | | | | | | | | Merge branch 'force-two-up-view' into 'master'Filipa Lacerda2017-09-212-6/+19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Force two up view Closes #32613 See merge request gitlab-org/gitlab-ce!14397
| * | | | | | | | | [skip ci] Add changelogforce-two-up-viewClement Ho2017-09-201-0/+5
| | | | | | | | | |
| * | | | | | | | | Force two up viewClement Ho2017-09-201-6/+14
| |/ / / / / / / /
* | | | | | | | | Merge branch 'bvl-transient-failure-health-controller-spec' into 'master'Douwe Maan2017-09-211-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't memoize storage configuration on `FsShardsCheck` Closes #38140 See merge request gitlab-org/gitlab-ce!14419
| * | | | | | | | | Don't memoize storage configuration on `FsShardsCheck`bvl-transient-failure-health-controller-specBob Van Landuyt2017-09-211-2/+2
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These values are already coming from memory, so we don't need to memoize. If we do memoize these, than the would not be stubbed when calling `stub_storage_settings` in specs
* | | | | | | | | Merge branch 'dm-closing-issue-urls' into 'master'Robert Speicher2017-09-213-3/+8
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly detect multiple issue URLs after 'Closes...' in MR descriptions Closes #33745 See merge request gitlab-org/gitlab-ce!14411
| * | | | | | | | Correctly detect multiple issue URLs after 'Closes...' in MR descriptionsdm-closing-issue-urlsDouwe Maan2017-09-213-3/+8
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch '32894-update-ux-icon-documentation' into 'master'Marcia Ramos2017-09-212-12/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "[Meta] Create Uniquely 'GitLab' Icons" Closes #32894 See merge request gitlab-org/gitlab-ce!14396
| * | | | | | | | update spacing32894-update-ux-icon-documentationsarrahvesselov2017-09-201-0/+4
| | | | | | | | |
| * | | | | | | | updated verbiage and added todosarrahvesselov2017-09-201-1/+4
| | | | | | | | |
| * | | | | | | | added icon image and updated verbiagesarrahvesselov2017-09-192-12/+3
| | | | | | | | |
* | | | | | | | | Merge branch 'docs/owners-can-create-subgroups' into 'master'Marcia Ramos2017-09-211-4/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document that group Owners can always create subgroups See merge request gitlab-org/gitlab-ce!14416
| * | | | | | | | | Document that group Owners can always create subgroupsAchilleas Pipinellis2017-09-211-4/+5
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/30473 MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14046
* | | | | | | | | Merge branch '32796-add-ee-tag-detection-to-remove-old-in-gitlab-backup' ↵Rémy Coutable2017-09-212-6/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Adds EE tag detection to remove_old in gitlab backup. Closes #32796 See merge request gitlab-org/gitlab-ce!14413
| * | | | | | | | | Adds EE tag detection to remove_old in gitlab backup.Tiago Botelho2017-09-212-6/+12
| |/ / / / / / / /
* | | | | | | | | Merge branch 'docs/autodevops-cleanup' into 'master'Achilleas Pipinellis2017-09-214-200/+370
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto DevOps docs cleanup Closes #37666, #37592, #37468, and #31641 See merge request gitlab-org/gitlab-ce!14293
| * | | | | | | | Auto DevOps docs cleanupAchilleas Pipinellis2017-09-214-200/+370
|/ / / / / / / /
* | | | | | | | Merge branch 'docs-updates-sharing-permissions-and-project-filter' into 'master'Achilleas Pipinellis2017-09-211-0/+0
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | new sharing permissions screenshot See merge request gitlab-org/gitlab-ce!14408
| * | | | | | | new sharing permissionsMike Bartlett2017-09-211-0/+0
| | | | | | | |
* | | | | | | | Merge branch '37220-es-modules' into 'master'Phil Hughes2017-09-2141-870/+931
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use modules in common utils See merge request gitlab-org/gitlab-ce!14074