Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2016-04-13Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer
2016-04-13Merge branch 'api-star-project' into 'master' Rémy Coutable
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
2016-04-13Styling changes to code and docsRobert Schilling
2016-04-13Merge branch 'external-omniauth-providers' into 'master' Marin Jankovski
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
2016-04-13Merge branch 'rs-archive-cache-worker-cron' into 'master' Dmitriy Zaporozhets
Move RepositoryArchiveCacheWorker to sidekiq-cron Closes #15105 See merge request !3663
2016-04-13Merge branch 'rs-gitlab-com-check' into 'master' Dmitriy Zaporozhets
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
2016-04-13Make staring API more restfulRobert Schilling
2016-04-13API: Star and unstar a projectRobert Schilling
2016-04-13Merge branch 'api-group-leaking' into 'master' Rémy Coutable
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
2016-04-13Merge branch 'api-move-issues' into 'master' Rémy Coutable
API: Ability to move an issue Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14741 See merge request !3593
2016-04-13Update tests for moving issues via APIRobert Schilling
2016-04-13API: Ability to move an issueRobert Schilling
2016-04-13Added ability to add custom tags to transactionsYorick Peterse
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.
2016-04-13API: Return 404 if user does not have access to groupRobert Schilling
2016-04-13Merge branch 'api-group-visibility' into 'master' Rémy Coutable
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
2016-04-13Add `Gitlab.com?` methodRobert Speicher
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.
2016-04-12Merge branch 'fix_emojis_not_showing_in_autocomplete' into 'master' Robert Speicher
Fix emoji aliases not showing in autocomplete closes #14948 See merge request !3595
2016-04-12Fix minor issues according development guidelinesRobert Schilling
2016-04-12Merge branch 'decouple-member-notification' into 'master' Douwe Maan
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
2016-04-12Merge branch 'fix-missing-saml-error-handling' into 'master' Robert Speicher
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
2016-04-12Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer
2016-04-12Move RepositoryArchiveCacheWorker to sidekiq-cronRobert Speicher
Closes #15105
2016-04-12Add a 'circuit breaker' for repo checksJacob Vosmaer
2016-04-12Merge branch 'api-delete-note' into 'master' Rémy Coutable
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
2016-04-12Merge branch 'api-get-tag' into 'master' Rémy Coutable
API: Ability to retrieve a single tag * Closes #14330 /cc @dblessing See merge request !3577
2016-04-12API: Ability to update a groupRobert Schilling
2016-04-12Adapt tests to new testing guidelinesRobert Schilling
2016-04-12Allow a project member to leave the projected through the APIZeger-Jan van de Weg
2016-04-12Fix code review issuesRobert Schilling
2016-04-12Delete notes via APIRobert Schilling
2016-04-12Fix minor styling issues from code reviewRobert Schilling
2016-04-12Merge branch 'api-fix-milestone-iid-filter' into 'master' Rémy Coutable
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
2016-04-12API: Ability to retrieve a single tagRobert Schilling
2016-04-12API: Add iid filter to milestonesRobert Schilling
2016-04-12API: Expose updated_at for notesRobert Schilling
2016-04-12Merge branch 'api-labels-info' into 'master' Rémy Coutable
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
2016-04-12Better control flow.Patricio Cano
2016-04-12Better control flow and added guard clause.Patricio Cano
2016-04-11Instrument Banzai codeYorick Peterse
2016-04-11Allow `external_providers` for Omniauth to be defined to mark these users as ↵Patricio Cano
external
2016-04-11Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre
2016-04-11Fixed stubbing for Gitlab::Metrics specsYorick Peterse
If the measure method uses Transaction.current directly the SQL subscriber (Subscribers::ActiveRecord) will add timings of queries triggered by DB cleaner.
2016-04-11Track call counts in Gitlab::Metrics.measure_blockYorick Peterse
2016-04-11Store block timings as transaction valuesYorick Peterse
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).
2016-04-09fix emoji aliases not showing in autocompleteArinde Eniola
2016-04-09Merge branch 'redis-connection-pool' into 'master' Robert Speicher
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
2016-04-08Merge branch 'instrument-rails-cache' into 'master' Yorick Peterse
Instrument Rails cache code See merge request !3619
2016-04-08Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre
2016-04-08Merge branch 'metrics-timestamp-precision' into 'master' Yorick Peterse
Use more accurate timestamps for InfluxDB. See merge request !3617
2016-04-08Instrument Rails cache codeYorick Peterse
This allows us to track how much time of a transaction is spent in dealing with cached data.