- 06 Jul, 2016 3 commits
-
-
tiagonbotelho authored
-
tiagonbotelho authored
-
tiagonbotelho authored
-
- 05 Jul, 2016 37 commits
-
-
Douwe Maan authored
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
-
Patricio Cano authored
-
Patricio Cano authored
-
Patricio Cano authored
-
Patricio Cano authored
-
Patricio Cano authored
-
Patricio Cano authored
-
Patricio Cano authored
-
Patricio Cano authored
-
Patricio Cano authored
-
Patricio Cano authored
-
Patricio Cano authored
-
Patricio Cano authored
-
Patricio Cano authored
-
Patricio Cano authored
-
Patricio Cano authored
-
Patricio Cano authored
-
Patricio Cano authored
-
Patricio Cano authored
Rename ENV['PROTOCOL'] to ENV['GL_PROTOCOL'] to conform to what GitLab Shell expects and make the `protocol` param in `GitAccess` mandatory.
-
Patricio Cano authored
-
Patricio Cano authored
-
Patricio Cano authored
-
Patricio Cano authored
-
Douwe Maan authored
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
-
Douwe Maan authored
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
-
Fatih Acet authored
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
-
Jacob Schatz authored
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
-
Jacob Schatz authored
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
-
Douwe Maan authored
Fix Changelog [ci skip] Fixing a duplicate entry in the Changelog. Fixes #19526 See merge request !5098
-
Robert Speicher authored
Update installation & update guides for 8.10 [ci skip] See merge request !5097
-
Connor Shea authored
-
Robert Speicher authored
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
-
Robert Speicher authored
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
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Achilleas Pipinellis authored
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
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Dmitriy Zaporozhets authored
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
-