- 06 7月, 2016 35 次提交
-
-
由 Patricio Cano 提交于
-
由 Patricio Cano 提交于
-
由 Patricio Cano 提交于
-
由 Patricio Cano 提交于
-
由 Patricio Cano 提交于
-
由 Patricio Cano 提交于
-
由 Patricio Cano 提交于
-
由 Patricio Cano 提交于
-
由 Patricio Cano 提交于
-
由 Patricio Cano 提交于
-
由 Patricio Cano 提交于
-
由 Patricio Cano 提交于
-
由 Patricio Cano 提交于
-
由 Patricio Cano 提交于
-
由 Patricio Cano 提交于
-
由 Patricio Cano 提交于
-
由 Patricio Cano 提交于
Rename ENV['PROTOCOL'] to ENV['GL_PROTOCOL'] to conform to what GitLab Shell expects and make the `protocol` param in `GitAccess` mandatory.
-
由 Patricio Cano 提交于
-
由 Patricio Cano 提交于
-
由 Patricio Cano 提交于
-
由 Patricio Cano 提交于
-
由 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
-
由 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
-
由 Fatih Acet 提交于
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 提交于
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 提交于
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 提交于
Fix Changelog [ci skip] Fixing a duplicate entry in the Changelog. Fixes #19526 See merge request !5098
-
由 Robert Speicher 提交于
Update installation & update guides for 8.10 [ci skip] See merge request !5097
-
由 Connor Shea 提交于
-
由 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
-
由 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
-
由 Rémy Coutable 提交于
Signed-off-by: NRémy Coutable <remy@rymai.me>
-
由 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
-
由 Rémy Coutable 提交于
Signed-off-by: NRémy Coutable <remy@rymai.me>
-
由 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
-
- 05 7月, 2016 5 次提交
-
-
由 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
-
由 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
-
由 Phil Hughes 提交于
-
由 Rémy Coutable 提交于
Signed-off-by: NRémy Coutable <remy@rymai.me>
-
由 Robert 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
-