summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\
| | * 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
|
View Lorry Controller Status