summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add and update .gitignore & .gitlab-ci.yml templates for 8.10update-templates-for-8-10Rémy Coutable2016-07-0625-24/+526
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'allow-disabling-of-git-access-protocol' into 'master' Douwe Maan2016-07-0529-37/+360
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add setting that allows admins to choose which Git access protocols are enabled. ## What does this MR do? It allows admins to disable one of the two protocols for Git access. They can choose to enable just SSH, HTTP or allow both. If one of them is disabled, the clone URL in the project will show only the allowed protocol, and no dropdown to change protocols will be presented. ## What are the relevant issue numbers? Full implementation on GitLab's side for #18601 GitLab Shell implementation: gitlab-org/gitlab-shell!62 GitLab Workhorse implementation: gitlab-org/gitlab-workhorse!51 ## Screenshots (if relevant) ![Screen_Shot_2016-06-16_at_12.26.19_PM](/uploads/bad845142e9704a7385b2eaca51fd4eb/Screen_Shot_2016-06-16_at_12.26.19_PM.png) ![Screen_Shot_2016-06-20_at_4.24.54_PM](/uploads/6e452dd269e06f0be23841ce93866ed6/Screen_Shot_2016-06-20_at_4.24.54_PM.png) /cc @jschatz1 this MR touches the UI. Please review. See merge request !4696
| * Use keyword arguments for boolean values and use `span` instead of `a` for ↵allow-disabling-of-git-access-protocolPatricio Cano2016-07-052-6/+6
| | | | | | | | clone "button"
| * Revert back to not defining a default Git access protocol.Patricio Cano2016-07-056-6/+6
| |
| * Rebasing caused `enabled_git_access_protocol` to become plural. Fixed here.Patricio Cano2016-07-053-3/+3
| |
| * Clone button should not be clickable when there is a disabled protocolPatricio Cano2016-07-053-3/+13
| |
| * Default Git access protocol to `web`Patricio Cano2016-07-059-21/+15
| |
| * Rename `enabled_git_access_protocols` to singular.Patricio Cano2016-07-059-14/+15
| |
| * Add `alt` text to the images in the documentation.Patricio Cano2016-07-051-2/+2
| |
| * Don't allow empty strings in the `protocol` check.Patricio Cano2016-07-051-1/+1
| |
| * Correct access control flow for Git HTTP requests.Patricio Cano2016-07-052-6/+12
| |
| * Clarify protocol access check, and make Git HTTP access call more specific.Patricio Cano2016-07-052-7/+7
| |
| * Render the status message with `plain:` so that the message gets passed to ↵Patricio Cano2016-07-051-1/+1
| | | | | | | | the Git client.
| * Render :forbidden *only* if HTTP is disabled.Patricio Cano2016-07-051-1/+5
| |
| * Added documentation on the access restrictions.Patricio Cano2016-07-054-0/+39
| |
| * Return :forbidden if HTTP protocol access is not allowedPatricio Cano2016-07-051-0/+6
| |
| * Raise an error if no protocol is passed to the GitAccess check.Patricio Cano2016-07-052-2/+3
| |
| * Add more tests to the allowed protocols featurePatricio Cano2016-07-052-5/+103
| |
| * Simplify access checksPatricio Cano2016-07-051-1/+7
| |
| * Rename ENV['PROTOCOL'] to ENV['GL_PROTOCOL'] to conform to what GitLab Shell ↵Patricio Cano2016-07-059-18/+12
| | | | | | | | expects and make the `protocol` param in `GitAccess` mandatory.
| * Only allow Git Access on the allowed protocolPatricio Cano2016-07-058-13/+46
| |
| * Refactor clone button sanitation to its own method to avoid duplication.Patricio Cano2016-07-051-2/+6
| |
| * Fix CSSPatricio Cano2016-07-051-1/+1
| |
| * Add setting that allows admins to choose which Git access protocols are enabledPatricio Cano2016-07-0512-12/+139
|/
* Merge branch '18593-autofilter-rinku-instrumentation' into 'master' Douwe Maan2016-07-052-0/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instrument Rinku usage ## What does this MR do? Add metrics instrumentation to Rinku, module methods (autolink) ## What are the relevant issue numbers? #18593 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - ~~[ ] API support added~~ - Tests - ~~[ ] 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 !5063
| * Instrument Rinku usage18593-autofilter-rinku-instrumentationPaco Guzman2016-07-042-0/+3
| |
* | Merge branch '18593-update-rinku' into 'master' Douwe Maan2016-07-052-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Rinku to 2.0.0 ## What does this MR do? Update Rinku gem to last stable version. ## What are the relevant issue numbers? #18593 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - ~~[ ] API support added~~ - Tests - ~~[ ] 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 !5064
| * | Bump Rinku to 2.0.018593-update-rinkuPaco Guzman2016-07-042-1/+2
| |/
* | Merge branch '19161-non-helpful-flash-message-when-attaching-file-fails' ↵Fatih Acet2016-07-051-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Hacked in a better message for attachment network error ## What does this MR do? Adds a better error message for when a user is uploading an attachment and they cannot reach the GitLab instance. Now displays `Network error. Please check your connection.`. ## Are there points in the code the reviewer needs to double check? As noted above, I think this is hacky, ideally this would be sent straight from the backend but if not then this should be handled globally? /cc @fatihacet ## Why was this MR needed? Attachment upload UX ## What are the relevant issue numbers? Closes #19161. ## Screenshots (if relevant) *UPDATED:* ![Screen_Shot_2016-06-30_at_00.42.37](/uploads/b3b4044782dd4c4c17735e99acc45502/Screen_Shot_2016-06-30_at_00.42.37.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4977
| * | _Hacked_ in a better error message19161-non-helpful-flash-message-when-attaching-file-failsLuke "Jared" Bennett2016-06-301-2/+2
| | | | | | | | | | | | Changed message to 'attaching the file failed' for all attachment errors
* | | Merge branch 'underscore-templates' into 'master' Jacob Schatz2016-07-054-16/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Naive attempt at fixing Underscore templates ## What does this MR do? Attempts to fix part of #18939. ## Are there points in the code the reviewer needs to double check? That this doesn't break anything. ## Why was this MR needed? See #18939. ## What are the relevant issue numbers? #18939 ## Does this MR meet the acceptance criteria? - Tests - [ ] Added for this feature/bug - [ ] All builds are passing See merge request !4842
| * | | Fix unescaped strings in Underscore templates.underscore-templatesConnor Shea2016-06-294-16/+16
| | | |
* | | | Merge branch 'ff-markdown-buttons-fix' into 'master' Jacob Schatz2016-07-051-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed markdown buttons in FF ## What does this MR do? The markdown buttons weren't working with the `execCommand` function. So it has to fallback to replacing the value in the textarea. See merge request !5085
| * | | | Fixed markdown buttons in FFff-markdown-buttons-fixPhil Hughes2016-07-051-2/+3
| | | | |
* | | | | Merge branch 'fix-changelog' into 'master' Douwe Maan2016-07-051-2/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Changelog [ci skip] Fixing a duplicate entry in the Changelog. Fixes #19526 See merge request !5098
| * | | | | Fix Changelog [ci skip]Connor Shea2016-07-051-2/+0
| | | | | |
* | | | | | 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>
* | | | | | Merge branch '18790-dont-show-request-button-to-project-owner' into 'master' Robert Speicher2016-07-0510-87/+115
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't show "request access" button to project owners This MR fixes an issue where project owners that are not in the project's members list (I believe this is how we handled project owners before, now we seem to create a "Master" member for the project creator) would see the `Request Access` button. This MR fixes this issue in a clean way by adding a new `:request_access` ability to replace an ugly helper. It also give project owners the ability to update & destroy a requester that would happen to be themselves (since owners could request access to their own project before this MR). Related to #18790. See merge request !5091
| * | | | | | Add a migration to remove requesters that are owners of their project18790-dont-show-request-button-to-project-ownerRémy Coutable2016-07-053-11/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Fix condition in Ability and start with cheaper checksRémy Coutable2016-07-051-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | New :request_access ability to replace a ugly helperRémy Coutable2016-07-058-87/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Group / project members cannot request access - Group members cannot request access to a group's project This addresses an issue where project owners could request access to their own project, leading to UI inconsistency where their requester status would replace their owner status. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'update-gemoji' into 'master' Robert Speicher2016-07-0511-2049/+2069
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add lib/gitlab/emoji.rb instead of gitlab_emoji gem and upgrade Gemojione - No reason to split it into a separate gem when the gem barely did anything. We can use gemojione directly, making updating gemojione that much easier. Unless there's a particularly good reason we were using the gem? - Fixes the Rake task since it broke after all the AwardEmoji changes. - Update gemojione to 2.6.1. Spring Update changes! http://emojione.com/releases/#2.2.0 See merge request !4919
| * | | | | | | Add emoji.rb in lib/gitlab instead of using the gitlab_emoji gem.update-gemojiConnor Shea2016-06-2911-2049/+2069
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No reason to split it into a separate gem when the gem barely did anything. We can use gemojione directly, making updating gemojione that much easier. Also fix the Rake task and update gemojione to 2.6.1. This adds the EmojiOne Spring update. Changelog: https://github.com/jonathanwiesel/gemojione/blob/master/CHANGELOG.md
* | | | | | | | Merge branch 'doc-custom-githook-ui' into 'master' Achilleas Pipinellis2016-07-054-40/+58
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document custom Git hook error message ## What does this MR do? Documents new functionality introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5073 ## Does this MR meet the acceptance criteria? - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5088
| * | | | | | | Change doc location of custom hooksdoc-custom-githook-uiAchilleas Pipinellis2016-07-054-55/+58
| | | | | | | |
| * | | | | | | Follow doc styleguideAchilleas Pipinellis2016-07-052-18/+20
| | | | | | | |
| * | | | | | | Add documentation for custom Git hook error message in GitLab's UIAchilleas Pipinellis2016-07-051-0/+13
| | | | | | | |
* | | | | | | | Merge branch 'project-header' into 'master' Dmitriy Zaporozhets2016-07-056-296/+248
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated project header ## What does this MR do? Updates the project header. ## What are the relevant issue numbers? Closes #18544, #18832 ## Screenshots (if relevant) ![Screen_Shot_2016-06-29_at_14.16.16](/uploads/4df895e7ecf42e5ddab3f2f1e47f8c7e/Screen_Shot_2016-06-29_at_14.16.16.png) See merge request !4989
| * | | | | | | | Chnaged padding of project header navproject-headerPhil Hughes2016-07-052-3/+3
| | | | | | | | |
View Lorry Controller Status