summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
Commit message (Collapse)AuthorAgeFilesLines
* Add Application Setting to configure default Repository Path for new projectsshards-configAlejandro Rodríguez2016-06-291-0/+1
|
* Fix builds API response not including commit dataGrzegorz Bizon2016-06-211-5/+1
|
* Merge branch '17521-gitlab-ci-yml-templates' into 'master' Jacob Schatz2016-06-211-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab CI Yaml template dropdown ## What does this MR do? Make it possible to select a dropdown for an easy start with GitLab CI. ## What are the relevant issue numbers? Closes #17521 ## TODO - [ ] Backend - [x] CHANGELOG item - [x] Fix rubocop failure - [x] API Support - [x] New tests - [x] Add disclaimer to the top of the gitlab-ci.yml - [ ] Frontend - [x] New tests See merge request !4411
| * Refactor Gitlab::GitignoresZJ van de Weg2016-06-201-2/+2
| |
* | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-06-201-0/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/runner-lock-on-project * upstream/master: (353 commits) Put some admin settings in dropdown Add styleguide on configuration settings documentation Remove Duplicated keys add UNIQUE index to fingerprint Avoid autoload issue such as 'Mail::Parsers::AddressStruct' Move appearance settings as sub tab to application settings use rails root join fixed a couple of errors spotted in production Fix RangeError exceptions when referring to issues or merge requests outside of max database values Fix bug in `WikiLinkFilter`. Grammar and typographic changes to artifacts documentation Tweak grammar Small frontend code fixes and restore 8a2d88f commit Warn about admin privilege to disable GitHub Webhooks Listing GH Webhooks doesn't stop import process for non GH admin users fixup! updated docs for api endpoint award emoji Update CHANGELOG Ensure Todos counters doesn't count Todos for projects pending delete Add endpoints for award emoji on notes Sort API endpoints and implement feedback Add endpoints for Award Emoji ...
| * Add endpoints for Award EmojiZ.J. van de Weg2016-06-171-0/+8
| | | | | | | | | | This only supports Issues and MergeRequests right now because of the consistency of the routes those models provide.
* | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-06-171-4/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/runner-lock-on-project * upstream/master: (337 commits) Update CHANGELOG for !4659 Center the header logo for all Devise emails Add previews for all customized Devise emails Customize the Devise `unlock_instructions` email Customize the Devise `reset_password_instructions` email Customize the Devise `password_change` emails Use gitlab-git 10.2.0 Use Git cached counters on project show page Fix indentation scss-lint errors Added title attribute to enties in tree view Closes #18353 Banzai::Filter::ExternalLinkFilter use XPath Reduce queries in IssueReferenceFilter Use gitlab_git 10.1.4 Fixed ordering in Project.find_with_namespace Fix images in emails Banzai::Filter::UploadLinkFilter use XPath Turn Group#owners into a has_many association Make project_id nullable CHANGELOG [ci skip] CHANGELOG [ci skip] ...
| * UI and copywriting improvements13948-access-request-to-projects-and-groupsRémy Coutable2016-06-141-4/+1
| | | | | | | | | | | | | | | | | | + Move 'Edit Project/Group' out of membership-related partial + Show the access request buttons only to logged-in users + Put the request access buttons out of in a more visible button + Improve the copy in the #remove_member_message helper Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'master' into feature/runner-lock-on-projectLin Jen-Shin2016-06-141-0/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (147 commits) Update CHANGELOG Remove deprecated issues_tracker and issues_tracker_id from project Schema doesn’t reflect the changes of the last 3 migrations Revert CHANGELOG Also rename "find" in the specs Change to new Notes styleguide Add guide on changing a document's location Change logs.md location in README Move logs/logs.md to administration/logs.md Make "four phase test" Only show branches for revert / cherry-pick Instrument all Banzai::ReferenceParser classes Removed old comment from update_column_in_batches Update columns in batches until no rows are left Remove counters from Pipeline navigation Handle NULL migration errors in migration helpers Fix typo causing related branches to Error 500 Improved SVG sanitizer specs to include smoke tests for clean. Refactored SVG sanitizer Added SVG sanitizer fix to the changelog ...
| * Fix Error 500 when using closes_issues API with an external issue trackerStan Hu2016-06-111-0/+5
| | | | | | | | Closes #18484
* | WIP, try to add views for locked runnersLin Jen-Shin2016-06-091-0/+1
|/
* Allow custom text on 'almost there' pageSean McGivern2016-06-081-0/+1
| | | | | | | | Add a new application setting, after_sign_up_text. This is text to be rendered as Markdown and shown on the 'almost there' page after a user signs up, but before they've confirmed their account. Tweak the styles for that page so that centered lists look reasonable.
* Add a `U2fRegistrations` table/model.Timothy Andrew2016-06-061-1/+1
| | | | | | | | | | | | | | - To hold registrations from U2F devices, and to authenticate them. - Previously, `User#two_factor_enabled` was aliased to the `otp_required_for_login` column on `users`. - This commit changes things a bit: - `User#two_factor_enabled` is not a method anymore - `User#two_factor_enabled?` checks both the `otp_required_for_login` column, as well as `U2fRegistration`s - Change all instances of `User#two_factor_enabled` to `User#two_factor_enabled?` - Add the `u2f` gem, and implement registration/authentication at the model level.
* Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-031-0/+1
|\
| * Add Application Setting to configure Container Registry token expire delay ↵Kamil Trzcinski2016-05-311-0/+1
| | | | | | | | (default 5min)
* | Incorportate feedbackZ.J. van de Weg2016-06-011-0/+2
| |
* | Merge branch 'master' into awardablesZJ van de Weg2016-05-251-0/+9
|\ \ | |/
| * Backend for a gitignores dropdownZeger-Jan van de Weg2016-05-201-0/+8
| |
| * Extend runner options that are configurable via APIGrzegorz Bizon2016-05-191-0/+1
| |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-181-4/+9
|\ \ | |/ | | | | | | | | | | | | # Conflicts: # app/controllers/projects/merge_requests_controller.rb # app/models/note.rb # db/schema.rb # spec/models/note_spec.rb
| * Merge branch 'docker-registry' into 'master' Douwe Maan2016-05-161-1/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added authentication service for docker registry This adds a simple authentication service for docker which uses current user credentials to authenticate pulls and pushes. I have only one concern. Since the `.docker/config` is unencrypted, thus the password for user stored there is unencrypted, maybe we should from the start implement function to generate/provide a separate password just for the purposes of accessing docker registry? What do you think @jacobvosmaer @sytses @marin? cc @marin See merge request !3787
| | * Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-131-2/+6
| | |\ | | | | | | | | | | | | | | | | # Conflicts: # config/initializers/1_settings.rb
| | * | Rename `images` to `container_registry`Kamil Trzcinski2016-05-091-1/+1
| | | |
| | * | Make images_enabled configurableKamil Trzcinski2016-04-291-1/+2
| | | |
| * | | Clean up LegacyDiffNote somewhatDouwe Maan2016-05-131-1/+1
| | | |
| * | | Extract LegacyDiffNote out of NoteDouwe Maan2016-05-131-3/+3
| | |/ | |/|
| * | Add API endpoints for un/subscribing from/to a labelAhmad Sherif2016-05-121-0/+4
| | | | | | | | | | | | Closes #15638
* | | Incorporate feedbackZeger-Jan van de Weg2016-05-111-2/+1
| | |
* | | Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-111-2/+14
|\ \ \ | |/ /
| * | Expose MergeRequest#user_notes_count in the API and use the method in issues ↵Rémy Coutable2016-05-091-1/+1
| | | | | | | | | | | | | | | | | | list Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | API: Expose Issue#user_notes_countcnam-dep2016-05-091-1/+1
| |/
| * Rename License entity to RepoLicense to avoid conflict with EElicense-templates-and-api-12804Rémy Coutable2016-04-191-1/+1
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Update to licensee 8.0.0 and fix API specsRémy Coutable2016-04-181-4/+5
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Continue implementation of the license template selector and /licenses API ↵Rémy Coutable2016-04-181-0/+11
| | | | | | | | | | | | endpoint Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Create table for award emojiZeger-Jan van de Weg2016-05-061-3/+4
|/
* 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
| |\