summaryrefslogtreecommitdiff
path: root/CHANGELOG
Commit message (Collapse)AuthorAgeFilesLines
* Add spec for deletion of authorized OAuth2 applicationStan Hu2016-04-141-0/+1
| | | | | | Closes #14370 Move gon function into its own helper
* Merge branch 'fix-trailing-slash-in-bamboo_url' into 'master' Robert Speicher2016-04-131-0/+1
|\ | | | | | | | | | | | | | | | | Fix a bug with trailing slash in bamboo_url Also, improve specs for BambooService Similar to !3679. See merge request !3680
| * Fix a bug with trailing slash in bamboo_urlRémy Coutable2016-04-131-0/+1
| | | | | | | | | | | | | | | | Also, improve specs for BambooService Similar to https://gitlab.com/gitlab-org/gitlab-ce/issues/3515 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'fix-trailing-slash-in-teamcity_url-3515' into 'master' Robert Speicher2016-04-131-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix trailing slash in teamcity_url Originally opened at !2309 by @ctmay4. As described in #3515, if you have trailing spaces in the the Teamcity server name, the service will not work properly. Switching from `URI.parse` to `URI.join` fixes it so that it works with or without a trailing slash. Fixes #3515. See merge request !3679
| * | Improve TeamcityService and its specsfix-trailing-slash-in-teamcity_url-3515Rémy Coutable2016-04-131-3/+1
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Fix a bug with trailing slash in teamcity_urlCharles May2016-04-121-0/+3
| | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/3515
* | | Merge branch 'async-related-mrs' into 'master' Rémy Coutable2016-04-131-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Load related MRs/branches asynchronously cc @dzaporozhets See merge request !3678
| * | | Load related MRs/branches asynchronouslyYorick Peterse2016-04-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently this works by loading the HAML partials via XHR. While this is not the nicest setup it _is_ the easiest setup using the tools we currently have. Loading this data asynchronously doesn't make loading the related MRs/branches itself faster, it merely ensures that loading the issue itself is not slowed down. Fixes gitlab-org/gitlab-ce#14949
* | | | Merge branch 'api-subscribe-issue-mr' into 'master' Rémy Coutable2016-04-131-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Subscribe and unsubscribe from issues and merge requests * Closes #6024 This MR is based on !3611, which must be merged first. See merge request !3615
| * | | | API: Ability to subscribe and unsubscribe from a merge requestRobert Schilling2016-04-131-1/+1
| | | | |
| * | | | API: Ability to subscribe and unsubscribe from an issueRobert Schilling2016-04-131-0/+1
| | | | |
* | | | | Merge branch 'push-ref' into 'master' Kamil Trzciński2016-04-131-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix high CPU usage when PostReceive receives refs/merge-requests/<id> Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12661 See merge request !3651
| * \ \ \ \ Merge branch 'master' into push-refKamil Trzcinski2016-04-131-0/+22
| |\ \ \ \ \
| * | | | | | Fix high CPU usage when PostReceive receives refs/merge-requests/<id>push-refKamil Trzcinski2016-04-111-0/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'api-star-project' into 'master' Rémy Coutable2016-04-131-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Star and unstar a project Add two new endpoints `POST /projects/:id/star` and `POST /projects/:id/unstar` to star and unstar a project. * Closes #12739 See merge request !3578
| * | | | | | API: Star and unstar a projectRobert Schilling2016-04-131-0/+1
| | |_|/ / / | |/| | | |
* | | | | | Instrument the HousekeepingService classinstrument-house-keepingYorick Peterse2016-04-131-0/+1
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | This allows us to track how much time is spent in updating the "pushes_since_gc" column as well as the time needed to obtain the lease.
* | | | | Merge branch 'external-omniauth-providers' into 'master' Marin Jankovski2016-04-131-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow Omniauth providers to be marked as external Related to #4009 With this MR we will be able to allow the user to set which Omniauth Providers they would like to have as external. All users login in via these providers will be marked as external, even if they already had an account before. If the provider is removed form the list of external providers, the users will be marked as internal at their next login. MR for Omnibus: gitlab-org/omnibus-gitlab!727 /cc @dblessing @DouweM See merge request !3657
| * | | | Added CHANGELOG itemPatricio Cano2016-04-111-0/+1
| | |/ / | |/| |
* | | | Merge branch 'api-group-leaking' into 'master' Rémy Coutable2016-04-131-0/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | API: Return 404 if user does not have access to group Closes #15185 After !3587 is merged, I'll update this one to also fix the return code of the tests in !3587. See merge request !3683
| * | | API: Return 404 if user does not have access to groupRobert Schilling2016-04-131-0/+1
| | | |
* | | | Merge branch 'api-move-issues' into 'master' Rémy Coutable2016-04-131-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Ability to move an issue Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14741 See merge request !3593
| * | | | Update tests for moving issues via APIRobert Schilling2016-04-131-1/+1
| | | | |
| * | | | API: Ability to move an issueRobert Schilling2016-04-131-0/+1
| | | | |
* | | | | Merge branch 'custom-transaction-tags' into 'master' Rémy Coutable2016-04-131-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added ability to add custom tags to transactions cc @pcarranza See merge request !3674
| * | | | | Added ability to add custom tags to transactionsYorick Peterse2016-04-131-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One use case for this is manually setting the "action" tag for Grape API calls. Due to Grape running blocks there are no human readable method names that can be used for the "action" tag, thus we have to set these manually on a case by case basis.
* | | | | Merge branch 'configure_trusted_proxies' into 'master' Rémy Coutable2016-04-131-0/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust the default trusted_proxies to only include localhost And also allow other trusted proxies to be added from the config.yml. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3538 Omnibus config: https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1208 See merge request !3524
| * | | | Add changelog entries, install docs, and gitlab.yml.example entry for the ↵DJ Mountney2016-04-121-0/+2
| | | | | | | | | | | | | | | | | | | | trusted_proxies setting
* | | | | Merge branch 'issue_15044' into 'master' Rémy Coutable2016-04-131-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Allow to close invalid merge request fixes #15044 See merge request !3664
| * | | | Add changelog entry, improve specs and model codeissue_15044Felipe Artur2016-04-121-0/+1
| | | | |
* | | | | Merge branch 'fix-stale-branch-count-cache' into 'master' Yorick Peterse2016-04-131-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix repository cache invalidation issue when project is recreated with an empty repo See merge request !3692
| * | | | | Fix repository cache invalidation issue when project is recreated with an ↵Stan Hu2016-04-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | empty repo To reproduce: 1. Create a project with some content 2. Rename the project 3. Create a new project with the same name. 4. Boom - 404. After step 2, the branch and tag counts were not being cleared. This would cause `repository.has_visible_content?` to erroneously return `true` for the newly-created project. Closes #13384
* | | | | | Merge branch 'api-group-visibility' into 'master' Rémy Coutable2016-04-131-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Ability to update a group This makes it much easier to update a group after introducing the group visibility. * Closes #14991 See merge request !3587
| * | | | | API: Ability to update a groupRobert Schilling2016-04-121-0/+1
| | | | | |
* | | | | | Updated CHANGELOGPhil Hughes2016-04-121-9/+1
| | | | | |
* | | | | | Updated based on Ruby feedbackPhil Hughes2016-04-121-0/+8
| | | | | |
* | | | | | Updated RubyPhil Hughes2016-04-121-0/+1
| |_|/ / / |/| | | | | | | | | | | | | | Added CHANGELOG item
* | | | | Merge branch 'decouple-member-notification' into 'master' Douwe Maan2016-04-121-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decouple membership and notifications This allow you to have notification setting per project even if you are member of group. It also creates background for having notification settings in project you are not member of. - [x] Make it work - [x] Migrations - [x] CHANGELOG - [x] More tests - [x] API For #3359 After this merge request there is still some work to be done: * create migration that remove duplicates in notification settings table and create uniq index (8.8 probably) * remove notification_level field from Member model in 9.0 * make proper API for notification settings * use `MemberCreateService` instead of Member#after_create callback for creating notification settings (after #14709) * maybe more tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3421
| * | | | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-111-0/+3
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Fix CHANGELOGDouglas Barbosa Alexandre2016-04-081-4/+0
| | | | |
| * | | | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-081-2/+94
| |\ \ \ \
| * | | | | Add changelog itemDmitriy Zaporozhets2016-03-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'feature/fix-14753' into 'master' Rémy Coutable2016-04-121-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #14753: Check if head is born before trying to detect main language This MR makes sure that head exists before trying to detect the main language. This prevents errors on repo's without a master branch. Closes #14753 See merge request !3654
| * | | | | | Add my nameJeroen Bobbeldijk2016-04-121-1/+1
| | | | | | |
| * | | | | | Add changelog, change code to guard clauseJeroen Bobbeldijk2016-04-111-0/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'instrument-service-classes' into 'master' Rémy Coutable2016-04-121-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instrument all service classes This will help us see where (mostly) Sidekiq code is spending time. See merge request !3675
| * | | | | | Changelog entry for service class instrumentationYorick Peterse2016-04-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'hide_help_block_when_creating_project_inside_group' into 'master' Rémy Coutable2016-04-121-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide help block when user is creating a new project inside a group closes #14092 ![fix](/uploads/13721117c410c8fe6937d44a3b0a90a8/fix.gif) See merge request !3427
| * | | | | | | hide help block when user is creating a new project inside a groupArinde Eniola2016-04-121-0/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'api-delete-note' into 'master' Rémy Coutable2016-04-121-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete notes via API Supports deleting issues, snippets, and merge requests via the API. * Closes #14944 * Closes #14845 * Closes #6060 @zj I did not see that you assigned yourself in #6060. Hopefully, you did not start yet. @rymai In #6060 this is targeted for 8.7 release. Could you review that and maybe this still lands in 8.7. See merge request !3557