summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | |
| * | | | Add builds API (listing, showing trace)Tomasz Maczukin2015-12-241-0/+13
| | | | |
* | | | | Merge branch 'master' into ci/api-triggersTomasz Maczukin2016-01-141-0/+4
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Fix version Improve the consistency of commit titles, branch names, tag names, issue/MR titles, on their respective project pages Update CHANGELOG [ci skip] Add some cosmetic changes to variables API documentation [ci skip] Modify builds API documentation style [ci skip] Modify :ci_variable factory Add 'Build' prefix to Variables entry name in API docs index Fix some typos Add some fixes after review Remove blank line Update ./doc/api Change :variable_id to :key as resource ID in API Fix a typo in method description Add create feature to variables API Add missing 'not_found' checks in variables API Add delete feature to variables API Add update feature for variables API Add features for list and show details of variables in API Conflicts: doc/api/README.md lib/api/entities.rb
| * | | | Merge branch '8-4-stable' into ci/api-variablesTomasz Maczukin2016-01-131-0/+1
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 8-4-stable: (285 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 Version 8.4.0.rc1 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 ...
| * | | | Update ./doc/apiTomasz Maczukin2016-01-071-1/+1
| | | | |
| * | | | Add features for list and show details of variables in APITomasz Maczukin2015-12-311-0/+4
| | |_|/ | |/| |
* | | | Merge branch '8-4-stable' into ci/api-triggersTomasz Maczukin2016-01-141-0/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 8-4-stable: (280 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 Version 8.4.0.rc1 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 ...
| * | | Modify CI features in projects APIci/api-projectsTomasz Maczukin2016-01-111-3/+1
| | | |
| * | | Add CI data to projcet entityTomasz Maczukin2016-01-051-0/+3
| |/ /
* | | Add some fixes after reviewTomasz Maczukin2016-01-131-7/+1
| | |
* | | Change 'trigger_id' to 'token' as resource ID in triggers APITomasz Maczukin2016-01-071-1/+1
| | |
* | | Add triggers feature to APITomasz Maczukin2016-01-041-0/+10
|/ /
* | Revert upvotes and downvotes params to MR APIValery Sizov2015-12-281-1/+0
|/
* Fix Rubocop complain.fix_rubocopRubén Dávila2015-12-161-1/+1
|
* Merge branch 'add-open-issues-count-to-api' of ↵Dmitriy Zaporozhets2015-12-161-0/+1
|\ | | | | | | | | | | https://gitlab.com/stanhu/gitlab-ce Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add open_issues_count to project APIStan Hu2015-12-111-0/+1
| | | | | | | | This is needed to support Huboard and a generally useful value.
* | Fixed Rubocop offensesGabriel Mazetto2015-12-151-1/+1
| |
* | Reimplement Trigger APIKamil Trzcinski2015-12-111-0/+4
| |
* | Migrate CI::Project to ProjectKamil Trzcinski2015-12-111-0/+1
| |
* | Migrate CI::Services and CI::WebHooks to Services and WebHooksKamil Trzcinski2015-12-101-2/+3
|/
* Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-12-071-2/+9
|\
| * Extent Event and Note APIextend-events-apiDmitriy Zaporozhets2015-12-041-0/+3
| | | | | | | | | | | | | | | | * add note to Events API * add author section to Events API * add noteable_id and noteable_type to Notes API Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Merge branch 'fix-award-emoji-api' into 'master' Robert Speicher2015-11-221-0/+5
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add upvote/downvote fields to merge request and note API to preserve compatibility As discussed in !1825 we should not break the API compatibility. * This MR adds the fields `upvotes`/`downvotes` to the merge request API again, which always return `0`. * Add the fields `upvote`/`downvote` to the notes API, which always return `false` This behavior is documented in the API docs. See merge request !1867
| | * Add upvote/downvote fields to merge request and note API to preserve ↵fix-award-emoji-apiRobert Schilling2015-11-211-0/+5
| | | | | | | | | | | | compatibility
| * | Make tag API consistent for release featureRobert Schilling2015-11-211-1/+2
| |/
| * award emojiValery Sizov2015-11-191-3/+1
| |
* | Specs for 'Merge When Build Succeeds'Zeger-Jan van de Weg2015-12-021-0/+1
|/
* Merge branch 'releases-feature'Dmitriy Zaporozhets2015-11-161-19/+29
|\
| * Add API docs and correctly expose release apiDmitriy Zaporozhets2015-11-121-25/+25
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Expose release notes to tags apiDmitriy Zaporozhets2015-11-121-0/+6
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add releases apiDmitriy Zaporozhets2015-11-121-0/+4
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Expose CI enable option in project featuresKamil Trzcinski2015-11-131-1/+1
|/ | | | - Enable CI by default for all new projects
* Add allow_failure field to commit status APIStan Hu2015-11-031-1/+1
| | | | Closes #3196
* Merge branch 'feature/api_hide_service_password' of gitlab.com:cernvcs/gitlab-cecernvcs_hide_passwrdValery Sizov2015-10-141-0/+12
|\
| * Hide passwords to non-admin users in the services APIAlex Lossent2015-10-121-0/+12
| | | | | | | | In order to be consistent with !1490 doing it for the web interface
* | Fix some changesKamil Trzcinski2015-10-121-1/+1
| |
* | Add author to statusesKamil Trzcinski2015-10-121-0/+1
| |
* | Implement Commit Status APIKamil Trzcinski2015-10-121-1/+7
|/
View Lorry Controller Status