summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | 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
| | |_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Allow a project member to leave the projected through the APIremove-myself-from-project-api-7687Zeger-Jan van de Weg2016-04-121-4/+9
| |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'api-fix-milestone-iid-filter' into 'master' Rémy Coutable2016-04-121-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Add iid filter to milestones This was documented in the API docs but it was never working because the iid filter was never applied to the milestones. The tests were working by accident because the were checking the first element, which was by accident the request element. * Closes https://github.com/gitlabhq/gitlabhq/issues/10122 See merge request !3588
| * | | | | | | | | | | | | | | | | API: Add iid filter to milestonesRobert Schilling2016-04-121-0/+2
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | API: Expose updated_at for notesRobert Schilling2016-04-121-1/+1
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'api-labels-info' into 'master' Rémy Coutable2016-04-121-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Expose open_issues_count, closed_issues_count, open_merge_requests_count on labels Partly fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13238 See merge request !3569
| * | | | | | | | | | | | | | | API: Expose open_issues_count, closed_issues_count, ↵Robert Schilling2016-04-061-0/+1
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | open_merge_requests_count on labels
* | | | | | | | | | | | | | | Instrument Banzai codeYorick Peterse2016-04-111-8/+12
| |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Fixed stubbing for Gitlab::Metrics specsYorick Peterse2016-04-111-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the measure method uses Transaction.current directly the SQL subscriber (Subscribers::ActiveRecord) will add timings of queries triggered by DB cleaner.
* | | | | | | | | | | | | | Track call counts in Gitlab::Metrics.measure_blockmetrics-measure-block-transactionYorick Peterse2016-04-111-0/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Store block timings as transaction valuesYorick Peterse2016-04-112-9/+25
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier to query, simplifies the code, and makes it possible to figure out what transaction the data belongs to (simply because it's now stored _in_ the transaction). This new setup keeps track of both the real/wall time _and_ CPU time spent in a block, both measured using milliseconds (to keep all units the same).
* | | | | | | | | | | | | Merge branch 'redis-connection-pool' into 'master' Robert Speicher2016-04-084-43/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redis connection pool Split from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232 Having an easily accessible Redis connection pool allows us to do more cool stuff with Redis in GitLab (instead of having to go through e.g. the Rails cache). See merge request !3521
| * | | | | | | | | | | | | Put CACHE_NAMESPACE in the Gitlab::Redis moduleJacob Vosmaer2016-04-072-1/+3
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Be careful when setting class instance varsJacob Vosmaer2016-04-041-2/+13
| | | | | | | | | | | | |