- 05 Jul, 2016 40 commits
-
-
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
-
Stan Hu authored
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 authored
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 authored
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Robert Speicher authored
`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
-
Robert Speicher authored
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
-
Dmitriy Zaporozhets authored
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
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
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
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Rémy Coutable authored
- 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>
-
Achilleas Pipinellis authored
-
Yorick Peterse authored
Instrument cache fetch hit and misses See merge request !4993
-
Achilleas Pipinellis authored
-
Achilleas Pipinellis authored
-
Phil Hughes authored
-
Achilleas Pipinellis authored
Fix wording around NGINX Shibboleth setup ![image](/uploads/de69ad7a056083ab4ca337d9cacad6e2/image.png) __________ ![image](/uploads/bd8081aa0e3a7bd0568267c4a485df5d/image.png) See merge request !5034
-
Paco Guzman authored
-
Paco Guzman authored
-
Achilleas Pipinellis authored
Add missing privileges to MySQL database Closes gitlab-org/gitlab-ce#19321 See merge request !5079
-
Yorick Peterse authored
Add index on both Award Emoji user and name See merge request !5061
-
Achilleas Pipinellis authored
[ci skip]
-
Rémy Coutable authored
Move global ci entries handling from legacy to new config ## What does this MR do? This MR moves responsibility of handling global CI config entries (like `image`, `services`), from legacy `GitlabCiYamlProcessor` to new CI Config ## Why was this MR needed? This is the next iteration of CI configuration refactoring ## What are the relevant issue numbers? #15060 ## Does this MR meet the acceptance criteria? - 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) See merge request !4820
-
Phil Hughes authored
-
Z.J. van de Weg authored
-