summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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
| | | | | | |
| * | | | | | Add Gitlab::Redis connection poolJacob Vosmaer2016-04-043-16/+24
| | | | | | |
* | | | | | | Merge branch 'instrument-rails-cache' into 'master' Yorick Peterse2016-04-081-0/+39
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Instrument Rails cache code See merge request !3619
| * | | | | | Instrument Rails cache codeinstrument-rails-cacheYorick Peterse2016-04-081-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to track how much time of a transaction is spent in dealing with cached data.
* | | | | | | Merge branch 'metrics-timestamp-precision' into 'master' Yorick Peterse2016-04-081-1/+21
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Use more accurate timestamps for InfluxDB. See merge request !3617
| * | | | | | Use more accurate timestamps for InfluxDB.metrics-timestamp-precisionYorick Peterse2016-04-081-1/+21
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the timestamp of metrics to be more accurate/unique by using Time#to_f combined with a small random jitter value. This combination hopefully reduces the amount of collisions, though there's no way to fully prevent any from occurring. Fixes gitlab-com/operations#175
* | | | | | API: Expose subscribed? on issuesRobert Schilling2016-04-084-13/+21
|/ / / / /
* | | | | Merge branch 'api-filter-milestone' into 'master' Rémy Coutable2016-04-071-2/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Ability to filter milestones by state Ability to filter milestones by `active` and `closed` state. * Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14931 See merge request !3566
| * | | | | Improve coding and doc styleRobert Schilling2016-04-061-1/+1
| | | | | |
| * | | | | API: Ability to filter milestones by stateRobert Schilling2016-04-061-2/+18
| | | | | |
* | | | | | Merge branch 'feature/expose-builds-badge' into 'master' Rémy Coutable2016-04-071-4/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose badges This MR exposes badge somewhere in visible place. ![expose_badges](/uploads/d2e290d3013d1ef2b1bdeebbbe2c5d8b/expose_badges.png) Closes #13801 See merge request !3326
| * | | | | | Extend build status badge, add html/markdown methodsGrzegorz Bizon2016-04-061-4/+26
| |/ / / / /
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqRobert Schilling2016-04-071-1/+1
|\ \ \ \ \ \
| * | | | | | Changed the argument of not_found for 'unprotect'Yasser Hussain2016-04-061-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | not_found appends string "Not Found" to the argument causing the resulting message to be "Branch does not exist Not Found" which is an incorrect error message. Changed the argument of not_found! for 'unprotect' command to "Branch" from "Branch does not exist". This makes the final error message to appear as "Branch Not Found" which is correct and same as error messages for other commands like 'protect'.
* | | | | | Merge branch 'saml-external-groups' into 'master' Robert Speicher2016-04-073-2/+64
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow SAML to identify external users and set them as such Related to #4009 Fixes #14577 This allows SAML to retrieve group information form the `SAML Response` and match that to a setting that will flag all matching users as external. See merge request !3530
| * | | | | | Implemented suggested fixesPatricio Cano2016-04-063-6/+4
| | | | | | |
| * | | | | | Added CHANGELOG itemsaml-external-groupsPatricio Cano2016-04-061-1/+0
| | | | | | |
| * | | | | | Fix error that was causing only one group to be returned and corrected specs ↵Patricio Cano2016-04-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to use the proper attribute type
| * | | | | | Changed config syntax and improved how chaanges in group memberships are ↵Patricio Cano2016-04-052-29/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | handled when external groups is set up
| * | | | | | Prepare SAML for group retrievalPatricio Cano2016-04-043-2/+80
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'patch/fix-markdown-preview-wikis' into 'master' Robert Speicher2016-04-073-6/+70
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wiki preview URL converting problem [via Markdown] Current implementation when rendering the preview, thinks relative links are for project repository files. We are creating a new preview route that will define correct context data to render for wikis instead. Fixes #2380, #1184 See merge request !3461
View Lorry Controller Status