root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
54,773 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

2111 Commits

Author SHA1 Message Date
vanadium23 eda30f3104 Filter archived project in API v3 only if param present 2017-06-21 20:04:25 +03:00
Grzegorz Bizon 0430b76441 Enable Style/DotPosition Rubocop 👮 2017-06-21 13:48:12 +00:00
Rémy Coutable 6a3da45a22 Merge branch '33878-fix-edit-deploy-key' into 'master' 
Fix edit button for deploy keys available from other projects

Closes #33878

See merge request !12301
 2017-06-21 10:08:16 +00:00
Rémy Coutable 18ef5be6c4 Merge branch 'dt/printing-to-api' into 'master' 
add printing_merge_request_link_enabled to API

See merge request !12240
 2017-06-21 09:00:57 +00:00
Douwe Maan 026455cf3a Merge branch '28517-discover-by-userid' into 'master' 
Allow discover by userid - issue 28517

Closes #28517

See merge request !12314
 2017-06-20 17:07:25 +00:00
Mike Ricketts 0e7478064f Re-instate is_admin flag in users API is current user is an admin 2017-06-20 14:54:29 +00:00
Matt Walsh 02ad2841d8 Allow discover by userid - issue 28517 2017-06-20 08:53:28 -06:00
Alexander Randa c7bcebd56e Fix edit button for deploy keys available from other projects 2017-06-20 11:23:13 +00:00
David Turner 1cd1bab3af add printing_merge_request_link_enabled to API 2017-06-19 13:33:15 -04:00
Douwe Maan b18c12ec6a Merge branch 'mk-add-project-moved-errors-for-git' into 'master' 
Add "project was moved" error messages for git

See merge request !11259
 2017-06-19 13:56:43 +00:00
Rémy Coutable 9fe6c2b2c2 Merge branch 'add-since-and-until-params-to-issuables' into 'master' 
add created_after and created_before params to issuables

Closes #32901

See merge request !12151
 2017-06-19 12:13:27 +00:00
Rémy Coutable 2923a0c8fe Merge branch '26212-upload-user-avatar-trough-api' into 'master' 
Accept image for avatar in user API

Closes #26212

See merge request !12143
 2017-06-19 10:41:00 +00:00
Sean McGivern a4a5cbf29a Merge branch 'issue_33205' into 'master' 
Fix API bug accepting wrong merge requests parameters

Closes #33205

See merge request !12173
 2017-06-19 08:06:01 +00:00
Kyle Bishop ef633d2478 add since and until params to issuables 2017-06-18 15:43:51 -07:00
Michael Kozono af784cc6e2 Add “Project moved” error to Git-over-SSH 2017-06-16 14:14:19 -07:00
vanadium23 83a9a472b3 Accept image for avatar in user API 2017-06-16 23:52:15 +03:00
Felipe Artur c472017078 Fix API bug accepting wrong merge requests parameters 2017-06-16 16:33:09 -03:00
Sean McGivern 352a9ed562 Merge branch '27070-rename-slash-commands-to-quick-actions' into 'master' 
Rename "Slash commands" to "Quick actions"

Closes #27070

See merge request !11811
 2017-06-16 16:32:53 +00:00
Felipe Artur 86fc145c3c Order issues by priority 2017-06-16 11:59:39 -03:00
Felipe Artur ff7fe2d12d Remove Drag and drop and sorting from milestone view 2017-06-16 11:59:39 -03:00
Eric Eastwood ea090291bb Rename "Slash commands" to "Quick actions" 
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27070

Deprecate "chat commands" in favor of "slash commands"

We looked for things like:

 - `slash commmand`
 - `slash_command`
 - `slash-command`
 - `SlashCommand`
 2017-06-15 09:01:56 -05:00
Mike Ricketts 03b2ac659e #13336 - display multiple messages in both the UI and git output 2017-06-15 13:47:33 +00:00
Douwe Maan 6bdfeff6e7 Merge branch 'help-landing-page-customizations' into 'master' 
Allow more customization to Help landing page

See merge request !11878
 2017-06-14 17:16:50 +00:00
Robin Bobbitt e09ddc62b3 Help landing page customizations 2017-06-14 11:40:21 -04:00
Tomasz Maczukin fa0a326bf2
Rename API::Entities::JobRequest::ServiceImage to API::Entities::JobRequest::Service 2017-06-12 12:58:36 +02:00
Tomasz Maczukin c70e9f2ed1
Send new configuration options with job's payload 2017-06-12 12:58:35 +02:00
vanadium23 4ccd799832 Accept image for avatar in project API 2017-06-09 22:49:57 +03:00
DJ Mountney e1d1a5240c Merge branch 'dz-api-x-frame' into 'security-9-2' 
Restrict API X-Frame-Options to same origin

See merge request !2103
 2017-06-08 09:54:24 -07:00
Douwe Maan dbffaaa97e Blob#load_all_data! doesn’t need an argument 2017-06-07 14:28:33 -05:00
Rémy Coutable ee0e3ffc05 Merge branch '3191-deploy-keys-update' into 'master' 
Implement ability to update deploy keys

Closes #3191

See merge request !10383
 2017-06-07 14:37:50 +00:00
Grzegorz Bizon 37dd19935b Merge branch 'instrument-infra' into 'master' 
Add Prometheus metrics endpoint and basic infrastructure to meter code

See merge request !11553
 2017-06-07 10:46:56 +00:00
Phil Hughes 563ea34692 Merge branch '12910-snippets-description' into 'master' 
Support descriptions for snippets

Closes #31894

See merge request !11071
 2017-06-07 09:26:48 +00:00
Grzegorz Bizon eebd18c3ac Merge branch '2563-backport-ee1942' into 'master' 
Backport some EE changes from adding shared_runners_minutes_limit to the API

Closes gitlab-ee#2563

See merge request !11936
 2017-06-07 07:04:21 +00:00
Roman Safronov 1110def8e2 Introduce optimistic locking support via optional parameter last_commit_id on File Update API 2017-06-06 13:55:29 +00:00
Lin Jen-Shin d919f924bf Backport https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1942 2017-06-06 21:42:45 +08:00
Mark Fletcher 3c15f0eae7 Accept a username for User-level Events API 2017-06-06 20:16:41 +08:00
Mark Fletcher ad3e180ed3 Introduce an Events API 
* Meld the following disparate endpoints:
 * `/projects/:id/events`
 * `/events`
 * `/users/:id/events`
+ Add result filtering to the above endpoints:
 * action
 * target_type
 * before and after dates
 2017-06-06 20:16:41 +08:00
Douwe Maan 5578506eb1 Merge branch 'mk-fix-git-over-http-rejections' into 'master' 
Fix Git-over-HTTP rejections

See merge request !11398
 2017-06-05 19:56:19 +00:00
Michael Kozono ef4e913597 Remove unnecessary variable 2017-06-05 10:39:32 -07:00
Michael Kozono b50a22894d Refactor construction of response 2017-06-05 05:32:26 -07:00
Michael Kozono 23d37382da Refactor to let GitAccess errors bubble up 
No external behavior change.

This allows `GitHttpController` to set the HTTP status based on the type of error. Alternatively, we could have added an attribute to GitAccessStatus, but this pattern seemed appropriate.
 2017-06-05 05:32:26 -07:00
Nick Thomas 158581a447 Refactor the DeleteUserWorker 2017-06-05 13:08:06 +01:00
Douwe Maan 70b927a55c Merge branch 'projects-api-import-status' into 'master' 
Expose import_status in Projects API

Closes #19646

See merge request !11851
 2017-06-02 22:16:54 +00:00
Douwe Maan 7cc734a217 Merge branch '28694-hard-delete-user-from-api' into 'master' 
Allow users to be hard-deleted from the API

See merge request !11853
 2017-06-02 20:48:40 +00:00
Robin Bobbitt c2516115e3 Expose import_status in Projects API 2017-06-02 15:35:51 -04:00
Pawel Chojnacki c28546177e Prometheus settings 2017-06-02 19:45:57 +02:00
Nick Thomas c890c6aaf2 Allow users to be hard-deleted from the API 2017-06-02 18:28:12 +01:00
Rémy Coutable 4cfa5ce4a9
Enable the Style/PreferredHashMethods cop 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-06-02 19:11:26 +02:00
Alexander Randa 3d70eeb5bb Implement ability to update deploy keys 2017-06-02 19:44:36 +03:00
Athar Hameed 578adc9bc6 Fix missing optional path parameter in "Create project for user" API 2017-06-02 20:58:48 +08:00