summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove trigger variables related coderemove-trigger-variables-related-codeShinya Maeda2019-03-252-15/+5
|
* Merge branch 'review-youtrack-docs' into 'master'Evan Read2019-03-222-21/+24
|\ | | | | | | | | | | | | YouTrack docs review Closes #58225 See merge request gitlab-org/gitlab-ce!26454
| * YouTrack docs reviewMike Lewis2019-03-222-21/+24
|/
* Merge branch 'docs/wiki-permissions' into 'master'Evan Read2019-03-222-5/+11
|\ | | | | | | | | | | | | Clarify wiki permissions Closes #53964 See merge request gitlab-org/gitlab-ce!23044
| * Clarify wiki permissionsdocs/wiki-permissionsAchilleas Pipinellis2018-11-142-5/+11
| |
* | Merge branch '57655-fix-markdown-tables-border' into 'master'awinata-operation-env-testClement Ho2019-03-215-12/+17
|\ \ | | | | | | | | | | | | | | | | | | Fix markdown table header and table content borders Closes #57655 See merge request gitlab-org/gitlab-ce!25666
| * | Remove :not pseudo-class from md-table stylesEnrique Alcántara2019-03-215-12/+17
|/ / | | | | | | | | | | | | Rollback change that adds :not(js-syntax-highlight) pseudo-class to markdown selectors to fix syntax highlight tables in MR code suggestions. Removes redundant inclusion of md-typography mixin as an alternative fix.
* | Merge branch ↵Clement Ho2019-03-212-3/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '56944-kubernetes-create-cluster-add-help-text-to-environment-field' into 'master' Resolve "Kubernetes > Create cluster > Add help text to environment field" Closes #56944 See merge request gitlab-org/gitlab-ce!25891
| * | Add help text to "environment scope" field in new cluster formMike Greiling2019-03-202-3/+6
| | |
* | | Merge branch '57894-buttons-on-group-page-are-misaligned' into 'master'Annabel Dunstone Gray2019-03-212-1/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Buttons on group page are misaligned" Closes #57894 See merge request gitlab-org/gitlab-ce!26292
| * | | Fix misalignment of group overview page buttonsDennis Tang2019-03-202-1/+6
| |/ /
* | | Merge branch 'winh-remove-sushi' into 'master'Mike Greiling2019-03-21104-148/+146
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove .raw from JavaScript fixture file names Closes #59201 See merge request gitlab-org/gitlab-ce!26430
| * | | Remove .raw from JavaScript fixture file namesWinnie Hellmann2019-03-21104-148/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There is nothing more to say but "Commits that change 30 or more lines across at least three files must describe these changes in the commit body"
* | | | Update VERSION to 11.10.0-prev11.10.0.preGitLab Release Tools Bot2019-03-211-1/+1
| | | |
* | | | Update CHANGELOG.md for 11.9.0GitLab Release Tools Bot2019-03-21231-1153/+260
| | | | | | | | | | | | [ci skip]
* | | | Merge branch 'docs-wip-refactor' into 'master'Achilleas Pipinellis2019-03-215-18/+39
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Rewrite Work In Progress MR page Closes #34559 See merge request gitlab-org/gitlab-ce!25732
| * | | | Docs: Rewrite Work In Progress MR pageMarcel Amirault2019-03-215-18/+39
|/ / / /
* | | | Merge branch '59147-duplicate-match-line' into 'master'Douwe Maan2019-03-214-11/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix duplicated bottom match line Closes #59147 See merge request gitlab-org/gitlab-ce!26402
| * | | | Fix diff bottom expand button appears twiceMark Chao2019-03-214-11/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a quick fix by only append match line once when calling diff_lines_for_serializer multiple time. Also enable feature by default
* | | | | Merge branch '10514-fix-non-existing-authorized-keys-file' into 'master'Nick Thomas2019-03-212-45/+145
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Handle cases when authorized_keys doesn't exist See merge request gitlab-org/gitlab-ce!26347
| * | | | | Update Gitlab::AuthorizedKeys specs to be clearerPatrick Bajao2019-03-211-4/+40
| | | | | |
| * | | | | Handle cases when authorized_keys doesn't existPatrick Bajao2019-03-202-46/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify Gitlab::AuthorizedKeys#rm_key and #list_key_ids to handle cases when an `Errno::ENOENT` is raised. Also added test cases in spec to ensure each method will still work when authorized_keys doesn't exist.
* | | | | | Merge branch 'doc-feature-flag-command' into 'master'Achilleas Pipinellis2019-03-211-0/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation reference for chatops feature flag commands See merge request gitlab-org/gitlab-ce!26425
| * | | | | | Add documentation reference for chatops feature flag commandsJacob Vosmaer2019-03-211-0/+14
| | | | | | |
* | | | | | | Merge branch 'ab-db-review-issue-template' into 'master'Douwe Maan2019-03-211-0/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add issue template for database reviewer See merge request gitlab-org/gitlab-ce!25867
| * | | | | | | Add issue template for database reviewerAndreas Brandl2019-03-201-0/+32
| | | | | | | |
* | | | | | | | Merge branch 'nfriend-update-merge-request-widget-pipeline-block' into 'master'Filipa Lacerda2019-03-2111-18/+328
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update merge request widget pipeline block to accommodate post-merge pipelines See merge request gitlab-org/gitlab-ce!25745
| * | | | | | | | Update merge request widget pipeline blockNathan Friend2019-03-2111-18/+328
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit updates the pipeline block that appears on the merge request page to include information that will be exposed by the API as part of the post-merge pipeline feature.
* | | | | | | | Merge branch 'mw-i18n-admin-controllers' into 'master'Lin Jen-Shin2019-03-2116-61/+235
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings in admin controllers See merge request gitlab-org/gitlab-ce!26357
| * | | | | | | | Externalize strings in admin controllersMartin Wortschack2019-03-2116-61/+235
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Update PO file
* | | | | | | | | Merge branch 'ek-clarify-creating-feature-flags' into 'master'Stan Hu2019-03-211-0/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs: Adds information and links to clarify how to create feature flags See merge request gitlab-org/gitlab-ce!26349
| * | | | | | | | | Adds info and links on creating feature flagsEzekiel Kigbo2019-03-211-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds A short summary of the steps to create and use feature flags in development for frontend developers who might be unfamiliar with `rails` and or `flipper`. Adds links to further reading in the development guide.
* | | | | | | | | | Merge branch ↵Kushal Pandya2019-03-213-7/+9
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '59189-long-names-in-project-path-namespace-dropdown-breaks-past-container' into 'master' Resolve "Long names in project path namespace dropdown breaks past container" Closes #59189 See merge request gitlab-org/gitlab-ce!26343
| * | | | | | | | | | Prevent namespace dropdown in new project form from exceeding containerDennis Tang2019-03-203-7/+9
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '59289-fix-push-to-create-protected-branches' into 'master'Douwe Maan2019-03-215-31/+61
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users to create protected branches via CLI Closes #59289 See merge request gitlab-org/gitlab-ce!26413
| * | | | | | | | | | Allow users to create protected branches via CLIPatrick Bajao2019-03-215-31/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is for fixing a regression introduced by: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24969 This fix will allow users who are allowed to push to protected branches to create protected branches via CLI as well, just like before. The checks for protected branch creation won't need to run.
* | | | | | | | | | | Merge branch '59117-inconsistent-hover-behavior-on-navbar-items' into 'master'Kushal Pandya2019-03-213-3/+10
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Inconsistent hover behavior on navbar items" Closes #59117 See merge request gitlab-org/gitlab-ce!26345
| * | | | | | | | | | Reset top position overridden by global button svg styleDennis Tang2019-03-201-1/+3
| | | | | | | | | | |
| * | | | | | | | | | Fix hover animation consistency in top navbar itemsDennis Tang2019-03-202-2/+7
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '59293-android-template-is-missing-gitlab-ci-yml' into 'master'Nick Thomas2019-03-212-0/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Android template is missing .gitlab-ci.yml" Closes #59293 See merge request gitlab-org/gitlab-ce!26415
| * | | | | | | | | | Resolve "Android template is missing .gitlab-ci.yml"Jason Lenny2019-03-212-0/+5
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'revert-1efa9604' into 'master'James Lopez2019-03-216-160/+31
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Enrich commits with full data in CommitCollection" See merge request gitlab-org/gitlab-ce!26412
| * | | | | | | | | | Revert "Merge branch ↵Sean McGivern2019-03-216-160/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '58805-allow-incomplete-commit-data-to-be-fetched-from-collection' into 'master'" This reverts merge request !26144
* | | | | | | | | | | Merge branch '59288-review-build-cng-fails-if-the-last-commit-skips-ci' into ↵Lin Jen-Shin2019-03-211-1/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Use the default git clone depth for the review-build-cng job Closes #59288 See merge request gitlab-org/gitlab-ce!26410
| * | | | | | | | | | Use the default git clone depth for the review-build-cng job59288-review-build-cng-fails-if-the-last-commit-skips-ciRémy Coutable2019-03-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | Merge branch 'nfriend-update-job-detail-view-sidebar' into 'master'Filipa Lacerda2019-03-215-49/+316
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update job detail view sidebar to accommodate post-merge pipelines See merge request gitlab-org/gitlab-ce!25777
| * | | | | | | | | | Update job detail sidebar for post-merge pipelinesNathan Friend2019-03-205-49/+316
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit updates the job detail view sidebar to accommodate new states introduced as part of the post-merge pipeline feature.
* | | | | | | | | | Merge branch 'gitaly-version-v1.29.0' into 'master'Douwe Maan2019-03-212-1/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Gitaly to v1.29.0 See merge request gitlab-org/gitlab-ce!26406
| * | | | | | | | | | Upgrade Gitaly to v1.29.0GitalyBot2019-03-212-1/+6
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'osw-multi-line-suggestions-parsing' into 'master'Grzegorz Bizon2019-03-2111-9/+167
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare multi-line suggestions for rendering in Markdown See merge request gitlab-org/gitlab-ce!26107