summaryrefslogtreecommitdiff
path: root/CHANGELOG
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix-image-diff' into 'master' Douwe Maan2016-03-191-0/+1
|\ | | | | | | | | | | | | | | | | Fix bug where wrong commit ID was being used in a merge request diff to show old image Closes #3769 Closes #14327 See merge request !3300
| * Fix bug where wrong commit ID was being used in a merge request diff to show ↵Stan Hu2016-03-191-0/+1
| | | | | | | | | | | | | | | | old image Closes #3769 Closes #14327
* | Merge branch 'remove-wip' into 'master' Jacob Schatz2016-03-191-0/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Easily (un)mark merge request as WIP using link Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3768 and https://gitlab.com/gitlab-org/gitlab-ce/issues/3516 ## Link to add `WIP` prefix (underline is visible because of hover) ![wipless_title](/uploads/72a6f7119ba9d8043ca8329641e97c3b/wipless_title.png) ## Link to remove `WIP` prefix ![wip_title](/uploads/8620ad65da9ef620b180603520fead55/wip_title.png) ## System note after WIP is added ![wip_sysnote](/uploads/2de073b75e854d2c9e243eb8b5d5c259/wip_sysnote.png) ## Widget with link to remove WIP ![wip_widget](/uploads/cf83ea93743c4c26d9df759c17cb9d7b/wip_widget.png) ## Flash after WIP is removed ![wip_flash](/uploads/27b7240cd5d7ceeb8b7b477abd94d7ff/wip_flash.png) ## System note after WIP is removed ![wipless_sysnote](/uploads/c0d3368abdf21a2f253532a9a9594d90/wipless_sysnote.png) ## Widget when current user cannot remove the WIP prefix ![wip_widget_unauthorized](/uploads/174ccf1674be86dc81c3078fe297acb7/wip_widget_unauthorized.png) cc @creamzy See merge request !3006
| * Remove CHANGELOG item that was added during merge resolutionremove-wipRémy Coutable2016-03-181-1/+0
| |
| * Merge remote-tracking branch 'origin/master' into remove-wipRémy Coutable2016-03-181-15/+103
| |\
| * \ Merge branch 'master' into remove-wipDouwe Maan2016-02-291-3/+6
| |\ \
| * | | Easily (un)mark merge request as WIP using linkDouwe Maan2016-02-261-0/+1
| | | | | | | | | | | | | | | | Fixes #3768
| * | | Use specialized system notes when MR is (un)marked as WIPDouwe Maan2016-02-261-0/+1
| | | |
* | | | Merge branch 'label-tooltip' into 'master' Douwe Maan2016-03-191-0/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add label description in tooltip to labels in issue index and sidebar The tooltip can get quite big, but it’s so useful to inform people about what these labels mean new ![Screen_Shot_2016-03-08_at_11.48.28](/uploads/894baaaa1f789c3a2069a924d541e64b/Screen_Shot_2016-03-08_at_11.48.28.png) ![Screen_Shot_2016-03-08_at_11.48.20](/uploads/efe4fa0960054c4071b8f6bf83024403/Screen_Shot_2016-03-08_at_11.48.20.png) @JobV writes on Slack: > yeah I think it’s better than not, but I’d have to try it :smiley: > > cautious yes, revert if it’s annoying :wink: See merge request !3124
| * | | Add label description in tooltip to labels in issue index and sidebarDouwe Maan2016-03-161-0/+1
| | | |
* | | | Fix an issue when the target branch of a MR had been deletedRémy Coutable2016-03-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before displaying the "diverged commits" note, we're checking if the MR is open, but we should check if it's mergeable instead because this check ensure the source and target branches exist. This was introduced by !2217 and fixes #14388.
* | | | Update CHANGELOGtrigger-todo-for-mentions-on-commits-pageDouglas Barbosa Alexandre2016-03-181-0/+1
| | | |
* | | | Merge branch 'fix-mr-source-sha' into 'master' Douwe Maan2016-03-181-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MergeRequest#source_sha when there is no diff Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14170 ### Overview This MR fixes an unhandled Exception when visiting the page of an open Merge Request without diff. ### Description `MergeRequest#source_sha` is expected to return the sha of the source branch last commit. But when an open Merge Request has no diff (e.g. all commits have already been merged to the target branch), `merge_request.source_sha` incorrectly returns `nil`. This was without consequences before – but since !2217 was merged (a few days ago), it makes `Gitlab::Git::Commit.between` raise an "Unexpected nil argument" exception. This can be reproduced when visiting the http://localhost:3000/gitlab-org/gitlab-test/merge_requests/2 page on a fresh local Gitlab setup. This MR fixes the crash, by making sure that `source_sha` returns a correct result even when there is no diff available. I also added tests. @DouweM I believe you wrote most of this code in the first place ; does this looks correct to you, or is there a better way to resolve this issue maybe? See merge request !3135
| * | | | Fix MergeRequest#source_sha when there is no diffPierre de La Morinerie2016-03-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `MergeRequest#source_sha` is expected to return the sha of the source branch last commit. But when a open Merge Request has no diff (e.g. all commits have already been merged to the target branch), `merge_request.source_sha` incorrectly returns `nil`. This was un-noticed before – but now that !2217 has been merged, it makes `Gitlab::Git::Commit.between` raise an "Unexpected nil argument" exception. This fixes the crash, by making sure that `source_sha` returns a correct result even when there is no diff available.
* | | | | Merge branch 'confidential-issues' into 'master' Douwe Maan2016-03-181-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add confidential issues Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/3678 More information: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/227 See merge request !3282
| * | | | | Update CHANGELOGconfidential-issuesDouglas Barbosa Alexandre2016-03-171-0/+1
| | | | | |
* | | | | | Fix CHANGELOG by moving 8.5.5 items to 8.6Rémy Coutable2016-03-181-2/+2
|/ / / / / | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'master' into git-2-7-4Douwe Maan2016-03-171-0/+2
|\ \ \ \ \
| * \ \ \ \ Merge branch 'hide-builds-feature' into 'master' Robert Speicher2016-03-171-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide builds from Project's settings when the feature is disabled Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/13944 See merge request !3220
| | * | | | | Hide builds from Project's settings when the feature is disabledhide-builds-featureKamil Trzcinski2016-03-151-0/+1
| | | | | | |
| * | | | | | Merge branch 'artem-forks/gitlab-ce-nginx-rel-url'Jacob Vosmaer2016-03-171-0/+1
| |\ \ \ \ \ \
| | * | | | | | Lets have CSS and logo inlineArtem Sidorenko2016-03-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This would work independenty from location and configuration https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/662#note_3973448
* | | | | | | | Bump Git version requirement to 2.7.4Douwe Maan2016-03-171-0/+3
|/ / / / / / /
* | | | | | | Merge branch 'glalonde-triggerbuild' into 'master' Kamil Trzciński2016-03-171-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjusted behavior so canceled builds tagged as allowed to fail do not fail build ## What does this MR do? This diff changes the 'Allowed to fail' flag to also ignore canceled builds, whereas before, canceled builds could fail the suite even if they were marked as 'Allowed to fail' dupe of !3258 to force a build ## Are there points in the code the reviewer needs to double check? no ## Why was this MR needed? Unexpected behavior as a user ## What are the relevant issue numbers? ## Screenshots (if relevant) ![whatisgoingon](/uploads/fcd7c8f3d8454bc730d7fd41eff59b31/whatisgoingon.png) See merge request !3271
| * | | | | | | added changelog entryGeoffrey Lalonde2016-03-171-0/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '4009-external-users' into 'master' Douwe Maan2016-03-171-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | External Users The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects. Partially fix for both #4009 and #13938 (except the LDAP sync or a pattern to detect external users) ![Screen_Shot_2016-03-14_at_22.02.52](/uploads/486a84ab3acb98c6cfb71a4ec7d268e2/Screen_Shot_2016-03-14_at_22.02.52.png) See merge request !3171
| * \ \ \ \ \ \ Merge branch 'master' into 4009-external-users4009-external-usersZeger-Jan van de Weg2016-03-151-1/+12
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into 4009-external-usersZeger-Jan van de Weg2016-03-141-0/+2
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Create an external users tab on Admin user listZeger-Jan van de Weg2016-03-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also incorporates the review into this, mainly spec changes.
* | | | | | | | | | Merge branch 'master' into new-branch-button-issueZeger-Jan van de Weg2016-03-171-0/+7
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'fix_wiki_links' into 'master' Robert Speicher2016-03-171-0/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wiki search results point to raw source Closes https://github.com/gitlabhq/gitlabhq/issues/9581 See merge request !3138
| | * | | | | | | | | Fix wiki search results point to raw sourceHiroyuki Sato2016-03-171-0/+1
| | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | Added omniauth-auth0 Gem + Applicable Documentation.Daniel Carraro2016-03-161-0/+1
| |/ / / / / / / /
| * | | | | | | | Merge branch 'support-utf8-wiki-page-title' into 'master' Douwe Maan2016-03-161-0/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support Wiki with UTF-8 page name ## What does this MR do? Support Wiki with UTF-8 page name. See https://github.com/gollum/gollum/pull/929 ## Why was this MR needed? Relax constraints for wiki slug in aac6598482036e12a20b4c75f2a508bd6a017245. It allows to create a wiki with UTF-8 name, but creating a wiki with UTF-8 name causes 500 error. Creating a wiki with UTF-8 name once, then creating or updating wiki with ascii name also cause 500 error i.e. no one can create and update any wiki pages in the project. ## Workaround 1. Go to `https://DOMAIN/repo/wikis/git_access` -> this page display the link to git clone 2. Clone the wiki repo 3. Find the page with UTF-8 name 4. Rename or Delete these files 5. Commit and push ## What are the relevant issue numbers? - #13979 - #13891 - #13698 - #13603 - #13317 - #12906 - #12825 - #10945 ## Todo - [x] Waiting for 'gollum-rugged_adapter' that support rugged v0.24.0 release 'gollum-rugged_adapter' gem doesn't allow to install rugged v0.24.0 (it's still beta version), but 'gitlab_git' gem depends on rugged v0.24.0b13. So it can't install both 'gollum-rugged_adapter' and 'gitlab_git' now. See merge request !2999
| | * | | | | | | | Support Wiki with UTF-8 page nameHiroyuki Sato2016-03-161-0/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'worker-for-user-deletion' into 'master' Douwe Maan2016-03-161-0/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A worker deletes a user, so the request doesn't time out Fixes #13261 See merge request !2855
| | * | | | | | | | | Specs for the DeleteUserServiceworker-for-user-deletionZeger-Jan van de Weg2016-03-151-1/+0
| | | | | | | | | | |
| | * | | | | | | | | Clearify who deletes the userZeger-Jan van de Weg2016-03-151-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Target right release, rebase got it wrongZeger-Jan van de Weg2016-03-151-0/+1
| | | | | | | | | | |
| | * | | | | | | | | Add ability to delete a user with forceZeger-Jan van de Weg2016-03-151-1/+1
| | | | | | | | | | |
| | * | | | | | | | | A worker deletes a user, so the request doesn't time outZeger-Jan van de Weg2016-03-151-0/+1
| | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #13261
| * | | | | | | | | Fix changelogDouwe Maan2016-03-151-1/+3
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into git-2-7-3Douwe Maan2016-03-151-1/+10
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| * | | | | | | | | Bump Git version requirement to 2.7.3Douwe Maan2016-03-151-0/+3
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Incorporate the review and update specZeger-Jan van de Weg2016-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The feature spec now also tests the absence of the new branch button
* | | | | | | | | Incorporate reviewZeger-Jan van de Weg2016-03-151-2/+1
| | | | | | | | |
* | | | | | | | | new-branch-buttonZeger-Jan van de Weg2016-03-151-0/+2
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge branch '12743-subscribe-to-label' into 'master' Rémy Coutable2016-03-151-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow subscribing to labels This implement #12743 and supersedes !2799 (thanks @timothyandrew!). - Subscribe (and unsubscribe) for labels - When an issue/merge request is created, notify all subscribers of all its labels - When an issue/merge request is edited, notify all subscribers of all its newly-added labels ## Done - [x] Verify that a user is signed in to subscribe/unsubscribe from a label. - [x] Merge conflicts - [x] Integration tests - [x] `issuable.subscribed?` should check subscribers and participants - [x] When an issuable is relabeled, notify subscribers of the *newly added* labels only - [x] Screenshots: ### Labels page ![Screen_Shot_2016-03-07_at_19.05.44](/uploads/3e69064e9e1a06ee2e27c778776c1407/Screen_Shot_2016-03-07_at_19.05.44.png) ### HTML email ![Screen_Shot_2016-03-07_at_19.07.36](/uploads/e484e06366a738385f1f6d71b52eecf7/Screen_Shot_2016-03-07_at_19.07.36.png) ### Plain text email ![Screen_Shot_2016-03-07_at_19.07.50](/uploads/dc05f710a8f7ab5eae9f72aa2110e741/Screen_Shot_2016-03-07_at_19.07.50.png) PS: I've set the milestone to 8.6 since it's getting late for 8.5... See merge request !3115
| * | | | | | | | Improving the original label-subscribing implementationRémy Coutable2016-03-151-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Make the "subscribed" text in Issuable sidebar reflect the labels subscription status 2. Current user mut be logged-in to toggle issue/MR/label subscription
| * | | | | | | | Original implementation to allow users to subscribe to labelsTimothy Andrew2016-03-151-0/+2
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Allow subscribing (the current user) to a label - Refactor the `Subscription` coffeescript class - The main change is that it accepts a container, and conducts all DOM queries within its scope. We need this because the labels page has multiple instances of `Subscription` on the same page. 2. Creating an issue or MR with labels notifies users subscribed to those labels - Label `has_many` subscribers through subscriptions. 3. Adding a label to an issue or MR notifies users subscribed to those labels - This only applies to subscribers of the label that has just been added, not all labels for the issue.