summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'simplify-gitlab-url_builder-15202' into 'master' Rémy Coutable2016-04-142-35/+42
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor and expose only Gitlab::UrlBuilder.build(record) ``` $ git grep Gitlab::UrlBuilder app/models/commit.rb: url: Gitlab::UrlBuilder.build(self), app/services/issues/base_service.rb: issue_url = Gitlab::UrlBuilder.build(issue) app/services/merge_requests/base_service.rb: hook_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(merge_request) app/views/search/results/_note.html.haml:- note_url = Gitlab::UrlBuilder.build(note) lib/gitlab/note_data_builder.rb: base_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(note) spec/lib/gitlab/note_data_builder_spec.rb: expect(data[:object_attributes][:url]).to eq(Gitlab::UrlBuilder.build(note)) spec/lib/gitlab/url_builder_spec.rb:describe Gitlab::UrlBuilder, lib: true do ``` Fixes #15202. See merge request !3696
| * Refactor and expose only Gitlab::UrlBuilder.build(record)simplify-gitlab-url_builder-15202Rémy Coutable2016-04-132-35/+42
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'api-issue-update-and-note-create-backdating-14947' into 'master' Rémy Coutable2016-04-142-2/+10
|\ \ | | | | | | | | | | | | | | | | | | API issue update and note create back dating Closes #14947 See merge request !3551
| * | Allow back dating notes on creationMichael Greene2016-04-131-0/+5
| | |
| * | Allow back dating issues on updateMichael Greene2016-04-131-2/+5
| | |
* | | Merge branch 'redis_config_consistency' into 'master' Valery Sizov2016-04-131-0/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Redis configuration consistency Related https://gitlab.com/gitlab-org/gitlab-ce/commit/cf669551f69edd66913d22c96cf1de1302e7990e See merge request !3697
| * | Redis configuration consistencyredis_config_consistencyValery Sizov2016-04-131-0/+2
| | |
* | | Merge branch 'redis_improvements' into 'master' Robert Speicher2016-04-131-5/+0
|\ \ \ | | | | | | | | | | | | | | | | Clean up ExclusiveLease See merge request !3695
| * | | clean up ExclusiveLeaseredis_improvementsValery Sizov2016-04-131-5/+0
| |/ /
* | | Merge branch 'api-subscribe-issue-mr' into 'master' Rémy Coutable2016-04-132-0/+72
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Ensure that issues and merge requests are foundRobert Schilling2016-04-131-4/+4
| | | |
| * | | Make subscription API more RESTfulRobert Schilling2016-04-133-31/+14
| | | |
| * | | API: Ability to subscribe and unsubscribe from a merge requestRobert Schilling2016-04-132-2/+38
| | | |
| * | | API: Ability to subscribe and unsubscribe from an issueRobert Schilling2016-04-132-0/+57
| | | |
* | | | Merge branch 'api-star-project' into 'master' Rémy Coutable2016-04-132-0/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Styling changes to code and docsRobert Schilling2016-04-132-2/+4
| | | | |
| * | | | Make staring API more restfulRobert Schilling2016-04-131-6/+5
| | | | |
| * | | | API: Star and unstar a projectRobert Schilling2016-04-132-0/+37
| |/ / /
* | | | Merge branch 'external-omniauth-providers' into 'master' Marin Jankovski2016-04-131-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Better control flow.external-omniauth-providersPatricio Cano2016-04-111-6/+4
| | | | |
| * | | | Allow `external_providers` for Omniauth to be defined to mark these users as ↵Patricio Cano2016-04-111-0/+12
| | | | | | | | | | | | | | | | | | | | external
* | | | | Merge branch 'rs-archive-cache-worker-cron' into 'master' Dmitriy Zaporozhets2016-04-131-1/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move RepositoryArchiveCacheWorker to sidekiq-cron Closes #15105 See merge request !3663
| * | | | | Move RepositoryArchiveCacheWorker to sidekiq-cronrs-archive-cache-worker-cronRobert Speicher2016-04-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Closes #15105
* | | | | | Merge branch 'rs-gitlab-com-check' into 'master' Dmitriy Zaporozhets2016-04-131-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `Gitlab.com?` method To be used as a feature flag for GitLab.com-only features, such as welcome emails. We will be careful to only use this to disable features or functionality that do not make sense for any installations that aren't GitLab.com. We will not use this to restrict features from other installations or keep them "exclusive" to GitLab.com. See merge request !3682
| * | | | | | Add `Gitlab.com?` methodrs-gitlab-com-checkRobert Speicher2016-04-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To be used as a feature flag for GitLab.com-only features, such as welcome emails. We will be careful to only use this to disable features or functionality that do not make sense for any installations that aren't GitLab.com. We will not use this to restrict features from other installations or keep them "exclusive" to GitLab.com.
* | | | | | | Merge branch 'api-group-leaking' into 'master' Rémy Coutable2016-04-131-2/+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-2/+1
| | | | | | |
* | | | | | | Merge branch 'api-move-issues' into 'master' Rémy Coutable2016-04-131-0/+23
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-7/+7
| | | | | | |
| * | | | | | API: Ability to move an issueRobert Schilling2016-04-131-0/+23
| |/ / / / /
* | | | | | Added ability to add custom tags to transactionsYorick Peterse2016-04-131-0/+10
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'api-group-visibility' into 'master' Rémy Coutable2016-04-131-2/+26
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Fix minor issues according development guidelinesRobert Schilling2016-04-121-6/+4
| | | | |
| * | | | API: Ability to update a groupRobert Schilling2016-04-121-2/+28
| | | | |
* | | | | Merge branch 'fix_emojis_not_showing_in_autocomplete' into 'master' Robert Speicher2016-04-121-2/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix emoji aliases not showing in autocomplete closes #14948 See merge request !3595
| * | | | | fix emoji aliases not showing in autocompletefix_emojis_not_showing_in_autocompleteArinde Eniola2016-04-091-2/+13
| | | | | |
* | | | | | Merge branch 'decouple-member-notification' into 'master' Douwe Maan2016-04-121-5/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-117-53/+138
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-0842-232/+711
| |\ \ \ \ \ \
| * | | | | | | Update API to use notification_level from notification_settingDmitriy Zaporozhets2016-03-301-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch 'fix-missing-saml-error-handling' into 'master' Robert Speicher2016-04-121-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add proper nil and error handling to SAML login process While writing the feature that would allow certain Omniauth providers to be marked as external I noticed that there is a scenario where the `gl_user` method can return `nil` and if this is not properly checked, it will lead to exceptions that will cause 500 errors. It is quite easy to land in this scenario, so I added `nil` checks. I also noticed that the `saml` method in the `omniauth_callbacks_controller.rb` file lacked a `rescue` for `Gitlab::OAuth::SignupDisabledError`, which can happen if the default configuration from `1_settings.rb` is applied. So I also added this check. See merge request !3609
| * | | | | | | | Better control flow and added guard clause.fix-missing-saml-error-handlingPatricio Cano2016-04-111-14/+9
| | | | | | | | |
| * | | | | | | | Add missing proper nil and error handling to SAML login process.Patricio Cano2016-04-071-8/+14
| | | | | | | | |
* | | | | | | | | Merge branch 'api-delete-note' into 'master' Rémy Coutable2016-04-121-0/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | Adapt tests to new testing guidelinesRobert Schilling2016-04-121-0/+2
| | | | | | | | | |
| * | | | | | | | | Fix code review issuesRobert Schilling2016-04-121-4/+2
| | | | | | | | | |
| * | | | | | | | | Delete notes via APIRobert Schilling2016-04-121-0/+17
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'api-get-tag' into 'master' Rémy Coutable2016-04-121-0/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Ability to retrieve a single tag * Closes #14330 /cc @dblessing See merge request !3577
| * | | | | | | | | Fix minor styling issues from code reviewRobert Schilling2016-04-121-3/+3
| | | | | | | | | |
| * | | | | | | | | API: Ability to retrieve a single tagRobert Schilling2016-04-121-0/+14
| | |_|_|_|_|_|_|/ | |/| | | | | | |
View Lorry Controller Status