summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
Commit message (Collapse)AuthorAgeFilesLines
* 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-081-4/+11
| |\
| * | Update API to use notification_level from notification_settingDmitriy Zaporozhets2016-03-301-5/+10
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | 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
* | | API: Expose subscribed? on issuesRobert Schilling2016-04-081-0/+8
| | |
* | | Expose user location in APIRobert Schilling2016-04-061-1/+1
|/ /
* | Merge branch 'routing' into 'master' Robert Speicher2016-04-011-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Added & use Gitlab::Routing for URL helpers Extracted from !3389 See merge request !3486
| * | Added & use Gitlab::Routing for URL helpersroutingYorick Peterse2016-04-011-2/+2
| |/ | | | | | | | | | | | | Rails' "url_helpers" method creates an anonymous Module (which a bunch of methods) on every call. By caching the output of this method in a dedicated method we can shave off about 10 seconds of loading time for an issue with around 200 comments.
* | Remove "Congratulations!" tweet button on newly-created project.connorshea2016-03-311-1/+0
|/ | | | | | | I’ve removed everything related to the feature based on this commit: ce08f919f34fd8849834365 Resolves #10857.
* api - expose label descriptionMariusz Jachimowicz2016-03-241-1/+1
|
* Improve group visibility level featureZeger-Jan van de Weg2016-03-181-1/+1
|
* Merge 4009-external-users into issue_12658Felipe Artur2016-03-161-7/+8
|\
| * Merge branch 'master' into 4009-external-users4009-external-usersZeger-Jan van de Weg2016-03-151-7/+0
| |\
| | * Merge branch 'fix-commit-status-rendering' into 'master' Robert Speicher2016-03-151-7/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup Ci::Commit, Ci::Build and CommitStatus views This MR tries to do first sweep of cleanups to Ci::Commit and Ci::Build objects removing all view-related functions and fixing the API from other side. Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/6046 See merge request !2760
| | | * Cleanup CiCommit and CiBuildKamil Trzcinski2016-03-141-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | - Remove all view related methods from Ci::Build and CommitStatus - Remove unused Ci::Commit and Ci::Build methods - Use polymorphism to render different types of CommitStatus
| * | | Doc external users featureZeger-Jan van de Weg2016-03-151-0/+1
| |/ /
| * | Merge branch 'share-project-ce' into 'master' Dmitriy Zaporozhets2016-03-141-0/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring from EE: Share Project with Group - [x] Models and migrations - [x] Logic, UI - [x] Tests - [x] Documentation - [x] Share with group lock - [x] Api feature - [x] Api docs - [x] Api tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> For #12831 cc @DouweM @rspeicher @vsizov See merge request !3186
| | * | Bring share project with group API from EEshare-project-ceDmitriy Zaporozhets2016-03-131-0/+4
| | |/ | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Don't remove `ProjectSnippet#expires_at` from APIrs-snippet-expires-apiRobert Speicher2016-03-091-0/+3
| |/ | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3103 This partially reverts commit 836d5930332797192094ce4a3c8083e96f7e8c53.
* | Prevent projects to have higher visibility than groupsFelipe Artur2016-03-101-0/+1
|/ | | | | | Prevent Groups to have smaller visibility than projects Add default_group_visibility_level to configuration Code improvements
* Merge branch 'rs-snippets-dont-expire' into 'master' Dmitriy Zaporozhets2016-03-091-1/+1
|\ | | | | | | | | | | | | | | | | Remove `Snippet#expires_at` This was removed from the interface in https://github.com/gitlabhq/gitlabhq/pull/6027 but its implementation lingered around for two years. See merge request !3103
| * Remove `Snippet#expires_at`rs-snippets-dont-expireRobert Speicher2016-03-051-1/+1
| | | | | | | | | | | | This was removed from the interface in https://github.com/gitlabhq/gitlabhq/pull/6027 but its implementation lingered around for two years.
* | Add fields to GET /users/* API endpoints for adminsevuez/gitlab-ce-add-info-user-apievuez2016-03-041-0/+2
|/ | | | | | | Added fields are last_sign_in_at and confirmed_at. They are available for GET /users/ and GET /users/:id for admins. Closes #840
* Use Gitlab::Git::DiffCollectionsJacob Vosmaer2016-03-031-3/+3
|
* Fix API implementationKamil Trzcinski2016-02-191-1/+1
|
* Introduce API for serving the artifacts archiveKamil Trzcinski2016-02-191-0/+5
|
* Rename Entities::ForkedFromProject to Entities::BasicProjectDetailsTomasz Maczukin2016-02-191-3/+3
|
* Change `last_contact` to `contacted_at`Tomasz Maczukin2016-02-191-1/+1
|
* Replace Entities::RunnerProjectDetails with Entities::ForkedFromProjectTomasz Maczukin2016-02-191-7/+1
|
* iChange `name` and `path` to `name_with_namespace` and `path_with_namespace` ↵Tomasz Maczukin2016-02-191-2/+2
| | | | in `RunnerProjectDetails`
* Modify runner projects selecting method in runners APITomasz Maczukin2016-02-191-3/+3
|
* Limit projects to user available projects if user is not an adminTomasz Maczukin2016-02-191-1/+7
|
* Add token to runner details output in APITomasz Maczukin2016-02-191-0/+1
|
* Add associated project info to runner details outputTomasz Maczukin2016-02-191-0/+7
|
* Add basic runners management APITomasz Maczukin2016-02-191-0/+6
| | | | | | | - add feature to list runners - add feature to show runners details - add feature to delete runner - add feature to update runner
* Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-02-091-1/+2
|\
| * Rename allow_guest_to_access_builds to public_buildsKamil Trzcinski2016-02-041-2/+2
| |
| * Expose allow_guest_to_access_builds in GitLab APIKamil Trzcinski2016-02-041-0/+1
| |
* | Expose MergeRequest::merge_status to APIAndrei Dziahel2016-02-081-0/+1
|/
* Merge branch 'master' into ci/api-triggersTomasz Maczukin2016-01-141-0/+27
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (150 commits) fixes margin and padding Update mailroom/postfix documentation [ci skip] Fix css mess around git clone panel. Align it properly Fix missing padding for user/group pages Fix parse_gollum_tags matcher Update documentation on Banzai::Filter::GollumTagsFilter Add tests for the wiki pipeline Refactoring Banzai::Filter::GollumTagsFilter Make sure the .git is at the end on Gitlab::GithubImport::WikiFormatter Remove GollumTagsPipeline Refactoring Gitlab::GithubImport::Importer Remove unnecessary brackets on WIKI_SLUG_ID route constraints Move js function to removing accents to vendor/assets/javascripts Update CHANGELOG Use the WikiPipeline when rendering the wiki markdown content Add Banzai::Filter::GollumTagsFilter for parsing Gollum's tags in HTML Relax constraints for wiki slug Import GitHub wiki into GitLab Move Ci::Build#available_statuses to AVAILABLE_STATUSES constant in CommitStatus Revert changes to how the notes are paginated in the API ... Conflicts: doc/api/README.md lib/api/entities.rb
| * Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-141-0/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (51 commits) Fix version Fix specs and rubocop warnings Improve the consistency of commit titles, branch names, tag names, issue/MR titles, on their respective project pages fixed LDAP activation on login to use new ldap_blocked state Fix Admin/Users view to position buttons without spacing magic Update to Go 1.5.3 Fix the undefinded variable error in Project's safe_import_url method Update CHANGELOG [ci skip] Add some cosmetic changes to variables API documentation [ci skip] Fix misaligned edit button in milestone collection partial Update button styles for Milestones#show Modify builds API documentation style [ci skip] Modify :ci_variable factory Ensure the API doesn't return notes that the current user shouldn't see Add 'Build' prefix to Variables entry name in API docs index Fix some typos Add spec for Note#cross_reference_not_visible_for? Remove (invalid) timestamp formatting Move `BroadcastMessage#status` to a helper since it's presentational Update CHANGELOG ... Conflicts: doc/api/README.md lib/api/api.rb lib/api/entities.rb
| * \ Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-131-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (76 commits) Add Changelog entry for build traces data integrity fix Update doc_styleguide.md [ci skip] Added hint that you can search users by name, username, or email. Add changelog Randomize metrics sample intervals Make the metrics sampler interval configurable Don't automatically require awesome_print Disable colorization if STDOUT is not a tty Block the reported user before destroying the record changes `$quote-gray` to `$secondary-text` makes message plural for multiple MRs and removes from loop. Duh. Prepare Installation and Update docs for 8.4 RC1 Mention channel/key bug in irkerd docs Revert "Remove the `:coffee` and `:coffeescript` Haml filters" gets merge request discussion working again adds back in discussion.haml.html for issues commenting and closing/reopening properly. removing last chunk of MR ajax changes, rest will be in another MR reverting more MR ajax files, will appear in different commit reverting MR ajax changes, which will be in a different MR reverting _mr_title.html.haml ...
| * | | Add some fixes after reviewTomasz Maczukin2016-01-131-4/+2
| | | |
| * | | Add some fixesTomasz Maczukin2016-01-121-1/+1
| | | |
| * | | Update ./doc/api/builds.mdTomasz Maczukin2016-01-111-1/+2
| | | |
| * | | Modify entities for builds APITomasz Maczukin2016-01-081-19/+18
| | | |
| * | | Merge branch 'master' into ci/api-buildsTomasz Maczukin2015-12-301-1/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (108 commits) Fix project transfer e-mail sending incorrect paths in e-mail notification Update CHANGELOG Use Gitlab::CurrentSettings for InfluxDB Write to InfluxDB directly via UDP Strip newlines from obfuscated SQL Add hotfix that allows to access build artifacts created before 8.3 note votes methids implementation When reCAPTCHA is disabled, allow registrations to go through without a code Downcased user or email search for avatar_icon. Handle missing settings table for metrics Fix broken link in permissions page [ci skip] reCAPTCHA is configurable through Admin Settings, no reload needed. Fixed syntax in gitlab.yml.example Move InfluxDB settings to ApplicationSetting Fix spelling mistake, thanks Connor. Restart settings are moved too. Hotfix for builds trace data integrity add issue weight to contributing Added host option for InfluxDB Fixed styling of MetricsWorker specs ...
| * | | | Add some fixes to builds APITomasz Maczukin2015-12-281-2/+18
| | | | |
View Lorry Controller Status