Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-07-06Services: code style fixes, minor refactoringservices_refactoringValery Sizov
2016-07-06Merge branch 'allow-disabling-of-git-access-protocol' into 'master' Douwe Maan
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
2016-07-06Use keyword arguments for boolean values and use `span` instead of `a` for ↵Patricio Cano
clone "button"
2016-07-06Revert back to not defining a default Git access protocol.Patricio Cano
2016-07-06Rebasing caused `enabled_git_access_protocol` to become plural. Fixed here.Patricio Cano
2016-07-06Clone button should not be clickable when there is a disabled protocolPatricio Cano
2016-07-06Default Git access protocol to `web`Patricio Cano
2016-07-06Rename `enabled_git_access_protocols` to singular.Patricio Cano
2016-07-06Add `alt` text to the images in the documentation.Patricio Cano
2016-07-06Don't allow empty strings in the `protocol` check.Patricio Cano
2016-07-06Correct access control flow for Git HTTP requests.Patricio Cano
2016-07-06Clarify protocol access check, and make Git HTTP access call more specific.Patricio Cano
2016-07-06Render the status message with `plain:` so that the message gets passed to ↵Patricio Cano
the Git client.
2016-07-06Render :forbidden *only* if HTTP is disabled.Patricio Cano
2016-07-06Added documentation on the access restrictions.Patricio Cano
2016-07-06Return :forbidden if HTTP protocol access is not allowedPatricio Cano
2016-07-06Raise an error if no protocol is passed to the GitAccess check.Patricio Cano
2016-07-06Add more tests to the allowed protocols featurePatricio Cano
2016-07-06Simplify access checksPatricio Cano
2016-07-06Rename ENV['PROTOCOL'] to ENV['GL_PROTOCOL'] to conform to what GitLab Shell ↵Patricio Cano
expects and make the `protocol` param in `GitAccess` mandatory.
2016-07-06Only allow Git Access on the allowed protocolPatricio Cano
2016-07-06Refactor clone button sanitation to its own method to avoid duplication.Patricio Cano
2016-07-06Fix CSSPatricio Cano
2016-07-06Add setting that allows admins to choose which Git access protocols are enabledPatricio Cano
2016-07-06Merge branch '18593-autofilter-rinku-instrumentation' into 'master' Douwe Maan
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
2016-07-06Merge branch '18593-update-rinku' into 'master' Douwe Maan
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
2016-07-06Merge branch '19161-non-helpful-flash-message-when-attaching-file-fails' ↵Fatih Acet
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
2016-07-06Merge branch 'underscore-templates' into 'master' Jacob Schatz
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
2016-07-05Merge branch 'ff-markdown-buttons-fix' into 'master' Jacob Schatz
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
2016-07-05Merge branch 'fix-changelog' into 'master' Douwe Maan
Fix Changelog [ci skip] Fixing a duplicate entry in the Changelog. Fixes #19526 See merge request !5098
2016-07-05Merge branch '8-10-guides' into 'master' Robert Speicher
Update installation & update guides for 8.10 [ci skip] See merge request !5097
2016-07-05Fix Changelog [ci skip]Connor Shea
2016-07-05Merge branch '18790-dont-show-request-button-to-project-owner' into 'master' Robert Speicher
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
2016-07-05Merge branch 'update-gemoji' into 'master' Robert Speicher
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
2016-07-05Update installation & update guides for 8.10Rémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-05Merge branch 'doc-custom-githook-ui' into 'master' Achilleas Pipinellis
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
2016-07-05Add a migration to remove requesters that are owners of their projectRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-05Merge branch 'project-header' into 'master' Dmitriy Zaporozhets
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
2016-07-05Merge branch 'rs-avatar_url-performance' into 'master' Stan Hu
Dumb-down avatar presence check in `avatar_url` methods `avatar.present?` goes through CarrierWave, and checks that the file exists on disk and checks its filesize. Because we're hitting the disk, this adds extra overhead to something where the worst-case scenario is rendering a broken image. Instead, we now just check that the _database attribute_ is present, which is good enough for our purposes. See https://gitlab.com/gitlab-org/gitlab-ce/issues/19273 See merge request !5093
2016-07-05Merge branch 'new-mr-commit-alignment' into 'master' Jacob Schatz
Fixed avatar alignment in new MR view ## What does this MR do? Fixes the alignment of the avatar in the new MR compare view ## Screenshots (if relevant) ![Screen_Shot_2016-07-05_at_16.17.54](/uploads/9c427f66f8ef1d5ecee627e57ee61322/Screen_Shot_2016-07-05_at_16.17.54.png) See merge request !5095
2016-07-05Fixed avatar alignment in new MR viewPhil Hughes
2016-07-05Fix condition in Ability and start with cheaper checksRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-05Dumb-down avatar presence check in `avatar_url` methodsRobert Speicher
`avatar.present?` goes through CarrierWave, and checks that the file exists on disk and checks its filesize. Because we're hitting the disk, this adds extra overhead to something where the worst-case scenario is rendering a broken image. Instead, we now just check that the _database attribute_ is present, which is good enough for our purposes. See https://gitlab.com/gitlab-org/gitlab-ce/issues/19273
2016-07-05Merge branch 'upgrade-doorkeeper' into 'master' Robert Speicher
Upgrade Doorkeeper from 3.1.0 to 4.0.0. Includes Rails 5 support and various bug fixes. Working toward #14286. Changelog: https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md#400 See merge request !5055
2016-07-05Merge branch 'dz-remove-profile-sidebar' into 'master' Dmitriy Zaporozhets
Remove current user link to the profile from sidebar Because user avatar and link to the profile are duplicated in the header now Related to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4939 and https://gitlab.com/gitlab-org/gitlab-ce/issues/18544 cc @iamphill @jschatz1 See merge request !5077
2016-07-05Set user data in profile link in the headerDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-07-05Fix profile test to click on header user profile linkDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-07-05Remove current user link to the profile from sidebarDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-07-05Merge branch 'dz-add-profile-settings-link' into 'master' Dmitriy Zaporozhets
Add profile settings link to header user dropdown It allows you to get to profile settings right from avatar without triggering sidebar Based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5077#note_12878162 See merge request !5090
2016-07-05Add profile settings link to header user dropdownDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-15 17:04:17 +0300