summaryrefslogtreecommitdiff
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Add 'Accept merge request' to permissions tabledoc-refactor-permissionsAchilleas Pipinellis2016-07-121-1/+1
|
* Change URLs to new permissions.md locationAchilleas Pipinellis2016-07-125-7/+7
|
* Change permissions URL in main readmeAchilleas Pipinellis2016-07-121-1/+1
|
* Move CI permissions to permissions.mdAchilleas Pipinellis2016-07-122-23/+2
|
* Move permissions/permissions.md to user/permissions.mdAchilleas Pipinellis2016-07-122-129/+132
|
* Small refactor and addition of CI permissionsAchilleas Pipinellis2016-07-121-13/+40
|
* Merge branch 'dz-ui-guide-nav' into 'master' Dmitriy Zaporozhets2016-07-121-0/+2
|\ | | | | | | | | | | | | Add rule about adding new header tab to the ui guide To address cases like https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3749#note_12994215 See merge request !5188
| * Improve wording in UI guideDmitriy Zaporozhets2016-07-121-1/+1
| |
| * Fix typo in UI guidedz-ui-guide-navDmitriy Zaporozhets2016-07-111-1/+1
| |
| * Add rule about adding new header tab to the ui guideDmitriy Zaporozhets2016-07-111-0/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'remove-branch-api' into 'master' Rémy Coutable2016-07-121-7/+23
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | api: expose {should,force}_remove_source_branch ## What does this MR do? Exposes the `should_remove_source_branch` and `force_remove_source_branch` booleans via the API. ## Are there points in the code the reviewer needs to double check? I don't think so. ## Why was this MR needed? See the commit message. ## What are the relevant issue numbers? N/A ## Screenshots (if relevant) N/A ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5184
| * | api: expose {should,force}_remove_source_branchBen Boeckel2016-07-111-7/+23
| |/ | | | | | | | | Workflows which use a bot to merge should remove branches if requested. Expose the flag so that bots can request know this.
* | Merge branch 'remove-not-released-status' into 'master' Robert Speicher2016-07-111-1/+1
|\ \ | |/ |/| | | | | | | | | Remove "not released" status from documentation [ci skip] See merge request !5024
| * Remove not released statusMax Raab2016-06-301-1/+1
| |
* | Add blockquote fence syntax to MarkdownDouwe Maan2016-07-091-1/+33
| |
* | Merge branch 'api-docs-typos' into 'master' Achilleas Pipinellis2016-07-092-44/+51
|\ \ | | | | | | | | | | | | Fix typos in API documentation See merge request !4949
| * | projects: add container_registry_enabled to API docsBen Boeckel2016-06-271-0/+7
| | |
| * | docs: fix some typosBen Boeckel2016-06-272-44/+44
| | |
* | | Merge branch 'patch-3' into 'master' Achilleas Pipinellis2016-07-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix phpunit command in the docker example. Closes https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/1478 See merge request !5147
| * | | gitlab-org/gitlab-ci-multi-runner#1478 Fixed phpunit command in the official ↵kujiy2016-07-081-1/+1
| | | | | | | | | | | | | | | | | | | | doc didn't work. Curl command has to follow redirects now.
* | | | Merge branch 'patch-3' into 'master' Achilleas Pipinellis2016-07-091-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix wrong gitlab-shell version in 8.9-8.10 update guide See merge request !5153
| * | | | Wrong gitlab-shell versionChristian Decker2016-07-081-1/+1
| | | | |
* | | | | Merge branch 'doc-custom-hooks' into 'master' Achilleas Pipinellis2016-07-091-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo and explain the precedence of STDERR and STDOUT ## What does this MR do? Addresses comments https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5088#note_12884564 See merge request !5169
| * | | | | Fix typo and explain the precedence of STDERR and STDOUTAchilleas Pipinellis2016-07-091-1/+2
| | | | | |
* | | | | | Update ui_guide.md with button capitalize ruledz-button-capitalizeDmitriy Zaporozhets2016-07-081-1/+2
| | | | | |
* | | | | | Merge branch 'edgemaster/gitlab-ce-patch-missing-api-docs'Rémy Coutable2016-07-081-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See !4096. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | API Docs: Add missing project option shared_runners_enabledThomas Wood2016-05-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced into the API in e80e3f53 [ci skip]
* | | | | | | Merge branch 'clarify-github-integration-docs' into 'master' Rémy Coutable2016-07-081-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix documentation for Github integration authorization callback url. There are two callbacks that could be used with Github integration: * /import/github/callback (used by project import) * /users/auth/github/callback (used by OmniAuth) Github's documentation suggests that authorization callback url should be set to the longest common path. https://developer.github.com/v3/oauth/#redirect-urls Configuring according to the previous documentation resulted in a redirect_uri_mismatch error from Github when logging in via OmniAuth. See merge request !4111
| * | | | | | | Fix documentation for Github integration authorization callback url.Eric K Idema2016-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two callbacks that could be used with Github integration: * /import/github/callback (used by project import) * /users/auth/github/callback (used by OmniAuth) Github's documentation suggests that authorization callback url should be set to the longest common path. https://developer.github.com/v3/oauth/#redirect-urls Configuring according to the previous documentation resulted in a redirect_uri_mismatch error from Github when logging in via OmniAuth.
* | | | | | | | Merge branch 'patch-1' into 'master' Rémy Coutable2016-07-081-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed Typo in README.md ## What does this MR do? Found a Typo in the README.md file. before_script should be with ":" Script didn't work for me without ":" ## Why was this MR needed? Missing ":" can be irritating for new users. See merge request !4419
| * | | | | | | | Fixed Typo in README.mdPhilipp Kraus2016-06-011-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'api-shared-projects' into 'master' Rémy Coutable2016-07-082-42/+242
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Api shared projects ## What does this MR do? Exposes the shared projects in the group endpoint ## What are the relevant issue numbers? Builds upon !5148 and closes #18780 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5150
| * | | | | | | | | API: Expose shared projects in a groupapi-shared-projectsRobert Schilling2016-07-081-1/+174
| | | | | | | | | |
| * | | | | | | | | Expose shared groups for projectsapi-shared-groupsRobert Schilling2016-07-082-41/+68
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #10368 from gsmetal/patch-1Robert Schilling2016-07-081-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | Fix unarchive mistake in projects API documentation
| * | | | | | | | Fix unarchive mistakeSergey Gnuskov2016-07-071-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'feature/option-set-new-users-external' into 'master' Rémy Coutable2016-07-081-0/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added setting to set new users by default as external ## What does this MR do? This implements the feature request #14508. It adds an option in the application settings to set new users by default as external. ## Are there points in the code the reviewer needs to double check? Everything. Like I mentioned in the discussion of the issue my knowledge of Ruby basically doesn't exists. I tested it on my machine and it seems to work, but as I am very unexperienced in Ruby I highly recommend to take a close look at the code. ## Why was this MR needed? It was requested by @DouweM to work on the issue with the proposed changes by me. ## What are the relevant issue numbers? This MR is for the issue #14508 that followed up after the implementation of #4009. See merge request !4545
| * | | | | | | Added setting to set new users by default as externalDravere2016-07-071-0/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As requested by the issue #14508 this adds an option in the application settings to set newly registered users by default as external. The default setting is set to false to stay backward compatible.
* | | | | | | Merge branch '18627-wildcard-branch-protection' into 'master' Douwe Maan2016-07-074-2/+26
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow specifying protected branches using wildcards Closes #18627 # Tasks - [ ] #18627 !4665 Allow specifying protected branches using wildcards - [x] Find existing usages of protected branches - Protecting branches - `ProtectedBranchesController` is used to mark a branch protected/unprotected - `API::Branches` can be used to mark a branch protected/unprotected - Enforcing branch protection - `Gitlab::GitAccess` has helpers (`can_push_to_branch?`, `check`) that are used to deny pushes if a branch is protected - Over SSH: `gitlab-shell` receives a push, and calls `/allowed` on the GitLab API, which calls `GitAccess.check` - Over HTTP: - `gitlab-workhorse` receives the request, and forwards it to rails - Rails (in the `GitHttpController#git-recieve-pack`) runs basic checks (is the user logged in, not protected branch checks) and returns ok with `GL_ID` and `RepoPath` - `gitlab-workhorse` looks at the response, and calls the relevant `gitlab-shell` action from `git-http/handlePostRPC` - Rest of this flow is the same as the SSH flow above - [x] Implementation - [x] Backend - [x] Change `project#protected_branch?` to look at wildcard protected branches - [x] Change `project#developers_can_push_to_protected_branch?` - [x] Change `project#open_branches` - [x] Better error message when creating a disallowed branch from the Web UI - [x] Frontend - [x] Protected branches page should allow typing out a wildcard pattern - [x] Add help text explaining the use of wildcards - [x] Show matching branches for each protected branch - [x] ~~On the index page~~ - [x] On a show page - [x] Index? - [x] Can't have the "last commit" column for wildcard protected branches - [x] Fix / write tests - [x] What happens if a hook is missing in dev? - [x] Refactor - [x] Test workflows - Create a branch matching a wildcard pattern - Push to a branch matching a wildcard pattern - Force push to a branch matching a wildcard pattern - Delete a branch matching a wildcard pattern - [x] Test using Web UI - [x] Test over SSH - [x] Test over HTTP - [x] Test as developer and master - [x] Investigate performance - [x] Test with a large number of protected branches / branches - [x] Paginate list of protected branches - [x] ~~Possibly rewrite `open_branches`~~ - [x] Add `iid`s to existing `ProtectedBranch`es - [x] Add documentation - [x] Add CHANGELOG entry - [x] Add screenshots - [x] Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/2f753e3ed2ce681b4444944d521f4419e8ed37f7/builds) passes - [x] Assign to endboss for review - [x] Address @DouweM's comments - [x] `protected_branch_params` - [x] `exact_match` instead of `explicit_match` - [x] When would self.name be blank? - [x] Move `protected_branches.each` to a partial - [x] Move `matching_branches.each` to a partial - [x] If the branch is in @matching_branches, it's not been removed - [x] move this regex to a method and memoize it - [x] `commit_sha` directly for exact matches - [x] Number of matches for wildcard matches, with a link - [x] Wait for [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/43f9ce0e88194b8f719bb1c1e656b7fc13278d56/builds) to pass - [x] Respond to @DouweM's comments - [x] Don't use iid - [x] Controller should use `@project.protected_branches.new` - [x] move the memoization to `def wildcard_regex` - [x] render with `collection: @protected_branches` - [x] Wait for [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/f7beedf122fa0c7aa89e86181fe7499321fb10ca/builds) to pass - [x] Wait for @DouweM's review - [x] Wait for @jschatz1's review - [x] Respond to @jschatz1's comments - [x] Use the new dropdown style - [x] description should be moved to the description section without the styling - [x] Protect button should be disabled when no branch is selected - [x] Update screenshots - [x] Merge conflicts - [x] Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/20f3cfe8d5540eab64c2ba548043d600b28c61ba/builds) passes - [ ] Revisit performance, possibly with staging/production data - [ ] Get a dump of staging / run against staging live - [ ] Get SSH access to staging - [ ] Wait for review/merge # Screenshots ## Creating wildcard protected branches ![1](/uploads/9446afccfdf6fa381e00c800dd2cc82e/1.png) ![2](/uploads/0b154503b297a818d3577488c575d845/2.png) ![3](/uploads/36217f79df9e41cc1550601f02627fe8/3.png) ![4](/uploads/041ca9bd529bcfa5373fca67e917cbcb/4.png) ### Using the `GLDropdown` component ![2016-06-30_14-16-15](/uploads/508afc2a5e2463c2954641409a560d88/2016-06-30_14-16-15.gif) ## Enforcing wildcard protected branches ### From the Web UI ![Screen_Shot_2016-06-20_at_1.21.18_PM](/uploads/8b5d4b1911e9152698a0488daf1880bc/Screen_Shot_2016-06-20_at_1.21.18_PM.png) ### Over SSH ![SSH](/uploads/7365989d7e4c406ef37b6ae5106442c9/SSH.gif) ### Over HTTPS ![HTTPS](/uploads/a7c0f56ae58efcffc75e6700fa2f4ac0/HTTPS.gif) ## Listing matching branches ![Screen_Shot_2016-06-20_at_1.33.44_PM](/uploads/d054113022f5d7ec64c0e57e501ac104/Screen_Shot_2016-06-20_at_1.33.44_PM.png) See merge request !4665
| * | | | | | Add documentation for wildcard protected branches.Timothy Andrew2016-07-054-2/+26
| | | | | | |
* | | | | | | Merge branch 'fix_ldap_config' into 'master' Drew Blessing2016-07-061-21/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix erroneous YAML spacing in LDAP configuration ## What does this MR do? Fix erroneous indentation in LDAP example configuration ## Are there points in the code the reviewer needs to double check? Is the indentation correct now? :joy: ## Why was this MR needed? Bad configs in docs suck. See merge request !4326
| * | | | | | | Fix erroneous YAML spacing in LDAP configurationDrew Blessing2016-05-271-21/+21
| | | | | | | |
* | | | | | | | Rebasing caused `enabled_git_access_protocol` to become plural. Fixed here.Patricio Cano2016-07-051-1/+1
| | | | | | | |
* | | | | | | | Add `alt` text to the images in the documentation.Patricio Cano2016-07-051-2/+2
| | | | | | | |
* | | | | | | | Added documentation on the access restrictions.Patricio Cano2016-07-054-0/+39
| | | | | | | |
* | | | | | | | Add setting that allows admins to choose which Git access protocols are enabledPatricio Cano2016-07-051-0/+1
| | | | | | | |
* | | | | | | | Merge branch '8-10-guides' into 'master' Robert Speicher2016-07-052-3/+194
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update installation & update guides for 8.10 [ci skip] See merge request !5097
| * | | | | | | | Update installation & update guides for 8.10Rémy Coutable2016-07-052-3/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Change doc location of custom hooksdoc-custom-githook-uiAchilleas Pipinellis2016-07-054-55/+58
| | | | | | | | |
* | | | | | | | | Follow doc styleguideAchilleas Pipinellis2016-07-052-18/+20
| | | | | | | | |