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
50,250 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

1933 Commits

Author SHA1 Message Date
Douwe Maan d170133bde Refactor changing files in web UI 2017-04-20 00:37:44 +00:00
Robert Speicher 93e23a5d71 Merge branch 'query-users-by-extern-uid' into 'master' 
Implement search by extern_uid in Users API

See merge request !10509
 2017-04-19 19:50:38 +00:00
Robin Bobbitt ddf7e6ae78 Implement search by extern_uid in Users API 2017-04-18 14:55:32 -04:00
Sean McGivern 380e40fee3 Remove unused user activities code 2017-04-14 15:20:55 +02:00
Rémy Coutable 814212621f Expose `last_activity_on` in the User API 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-04-14 15:20:55 +02:00
Sean McGivern 91ac0e038a Port 'Add user activities API' to CE 
CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/962
 2017-04-14 15:20:55 +02:00
James Lopez 3cb84e06b7 Remove user activities table and use redis instead of PG for recording activities 
Refactored specs and added a post deployment migration to remove the activity users table.
 2017-04-14 15:20:55 +02:00
James Lopez 2951a8543e Add user activity service and spec. Also added relevant - NOT offline - migration 
It uses a user activity table instead of a column in users.
Tested with mySQL and postgreSQL
 2017-04-14 15:20:55 +02:00
Z.J. van de Weg e415ad3952 Fix API not accepting job_events for webhooks 
When renaming, the argument on the projects hook API was forgotten. Now
one could successfully set it again.

The fix is a little ugly stylewise, but needed as the underlying model
still refers to it as build_events. This commit is to fix it, later we
should migrate the data to a new column. The edit on the spec file makes
sure it passes now, and will fail when we migrate the column.
 2017-04-12 10:06:57 +02:00
Oswaldo Ferreira ce4a50fcfb Add share_with_group_lock to CE optional params block 2017-04-10 16:22:48 -03:00
Oswaldo Ferreira fd32960e7c Separate CE params on Grape API 2017-04-10 16:13:48 -03:00
Rémy Coutable 710cd82cc1 Set Git-specific env in /api/internal/allowed 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-04-10 16:10:18 +02:00
blackst0ne 11aff97d88 Remove the User#is_admin? method 2017-04-09 13:20:57 +11:00
Douwe Maan 46aadc5c16 Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' 
Protected Tags

Closes #18471

See merge request !10356
 2017-04-07 15:43:28 +00:00
Jacob Vosmaer 20d415a676 Use Gitlab::Git::Repository#gitaly_... more 2017-04-07 12:53:30 +02:00
Kushal Pandya 8a5ca1121b Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags' 
# Conflicts:
#   spec/lib/gitlab/import_export/all_models.yml
 2017-04-06 21:12:16 +00:00
James Edwards-Jones 55811ac990 Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tags 2017-04-06 21:35:01 +01:00
Douwe Maan 00e00cacf8 Merge branch 'microsoft-teams-integration' into 'master' 
adds initial microsoft teams integration

See merge request !10412
 2017-04-06 19:37:25 +00:00
Tiago Botelho 1f404065ca adds relevant tests 2017-04-06 19:47:07 +01:00
Kamil Trzciński 828d81ee1f Optimise trace handling code to use streaming instead of full read 2017-04-06 16:20:27 +00:00
Rémy Coutable 32db15b24b Merge branch '28810-projectfinder-should-handle-more-options' into 'master' 
ProjectsFinder should handle more options

Closes #28810

See merge request !9682
 2017-04-06 10:22:04 +00:00
Rémy Coutable d7e3f2322f Merge branch '30021-api-deploy_keys-can_push-is-not-honoured' into 'master' 
Enable creation of deploy keys with write access via the API

Closes #30021

See merge request !10488
 2017-04-06 10:11:31 +00:00
Kushal Pandya 18506d4b8b Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags' 
# Conflicts:
#   app/assets/javascripts/dispatcher.js
#   app/assets/stylesheets/pages/projects.scss
 2017-04-06 09:46:50 +00:00
Jacopo b996a82ff4 ProjectsFinder should handle more options 
Extended ProjectFinder in order to handle the following options:
 - current_user - which user use
 - project_ids_relation: int[] - project ids to use
 - params:
   -  trending: boolean
   -  non_public: boolean
   -  starred: boolean
   -  sort: string
   -  visibility_level: int
   -  tags: string[]
   -  personal: boolean
   -  search: string
   -  non_archived: boolean

GroupProjectsFinder now inherits from ProjectsFinder.
Changed the code in order to use the new available options.
 2017-04-06 07:11:37 +02:00
Sean McGivern 50a0fd03ad Merge branch '30195-document-search-param-on-api' into 'master' 
Add "search" optional param and docs for V4

Closes #30195

See merge request !10358
 2017-04-05 21:49:06 +00:00
Robert Speicher ebdfda69bf Merge branch 'gitaly-refs' into 'master' 
Implement Gitaly refs client

See merge request !9291
 2017-04-05 17:22:45 +00:00
Oswaldo Ferreira 7cb907cc77 Add "search" optional param and docs for V4 
Notice that this param is being supported since V3, but we have not added the proper docs for it
 2017-04-05 13:50:12 -03:00
Kamil Trzciński 7f8e0bce5a Added mock deployment and monitoring service with environments fixtures 2017-04-05 11:04:34 +00:00
Mark Fletcher 4865a7ab92 Enable creation of deploy keys with write access via the API 
* Documentation was incorrectly advertising the missing param
 2017-04-05 16:22:28 +10:00
Rémy Coutable 93de37ce1b Merge branch 'bug/api_milestone_merge_requests_scope' into 'master' 
Fixes milestone/merge_request API endpoint to really scope the results

See merge request !10369
 2017-04-04 16:45:31 +00:00
Alejandro Rodríguez 267cd3e359 Incorporate Gitaly client for refs service 2017-04-04 16:53:44 +02:00
Kamil Trzciński 5efd67942c Merge branch 'backport-sticking-api-helper-changes' into 'master' 
Backport API changes needed to fix sticking in EE

See merge request !10376
 2017-04-04 11:31:21 +00:00
James Edwards-Jones 90c8bb8301 Fixed developers_can_push in RepoBranch API entity 2017-04-04 01:39:34 +01:00
James Edwards-Jones bf3cc824e4 Moved Project#protected_branch? to ProtectedBranch, similar for tags 2017-04-03 19:19:54 +01:00
Rémy Coutable ca6a7f1e9c Merge branch 'style-proc-cop' into 'master' 
Enable Style/Proc cop for rubocop

See merge request !10382
 2017-04-03 16:47:18 +00:00
Joren De Groof d663b8de24 Fixes milestone/merge_request API endpoint to really scope the results 
The MergeRequestsFinder uses the milestone_title instead of the
milestone_id
 2017-04-03 18:36:51 +02:00
James Edwards-Jones 65f3d5062f Extract ProtectedRef Concern 2017-04-03 17:19:53 +01:00
Douwe Maan b2700e64cc Merge branch '22303-symbolic-in-tree' into 'master' 
#22303 fix mode representation git::tree ( in base 8 )

Closes #22303

See merge request !9780
 2017-04-03 15:59:24 +00:00
Sean McGivern 872b3215d2 Merge branch 'introduce-base-polling-interval' into 'master' 
Introduce "polling_interval_multiplier" as application setting

Closes #29759

See merge request !10280
 2017-04-03 14:51:37 +00:00
Adam Niedzielski 9543025e88 Introduce "polling_interval_multiplier" as application setting 
Implement module for setting "Poll-Interval" response header.
Return 429 in ETag caching middleware when polling is disabled.
 2017-04-03 15:17:04 +02:00
Stan Hu 6a2d022d1d Delete users asynchronously 2017-04-02 05:37:05 -07:00
mhasbini ed5d59d4c4 Fix symlink icon in project tree 2017-04-02 14:42:37 +03:00
mhasbini 0a09925dce Enable Style/Proc cop for rubocop 2017-04-02 12:48:43 +03:00
Yorick Peterse d2283f4f0e
Backport API changes needed to fix sticking in EE 
These changes are ported over from
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1502 to reduce
the number of merge conflicts that may occur.
 2017-03-31 13:56:53 +02:00
Sean McGivern 4d9cc94170 Merge branch 'gitaly-socket-per-shard' into 'master' 
One Gitaly connection per storage shard

See merge request !10150
 2017-03-29 15:46:11 +00:00
Rémy Coutable 03c24c3318 Merge branch '23655-api-group-issues' into 'master' 
Fix API group/issues default state filter

Closes #23655

See merge request !10253
 2017-03-29 12:51:37 +00:00
Jacob Vosmaer 8f50ef5e75 Separate GRPC channels per repository storage 2017-03-29 14:48:05 +02:00
Dongqing Hu 6dd7695444 Labels support color names in backend 2017-03-29 11:45:15 +00:00
Rémy Coutable 520f7cd08a Merge branch 'tc-api-remove-comments-endpoint' into 'master' 
API: Make the /notes endpoint work with noteable iid instead of id

Closes #29871

See merge request !10258
 2017-03-28 17:41:16 +00:00
Alexander Randa c4be3460c2 Fix API group/issues default state filter 2017-03-28 17:43:55 +03:00