5edd94ae75
Merge branch '40744-hashed-storage-specs' into 'master'
...
Use hashed storage in the specs
Closes #40744
See merge request gitlab-org/gitlab-ce!15681
2018-02-08 17:11:43 +00:00
b7a2ce52ed
Merge branch '41763-search-api' into 'master'
...
Search API
Closes #41763
See merge request gitlab-org/gitlab-ce!16878
2018-02-07 14:33:29 +00:00
6b0c6e69e1
Use hashed storage in the specs
2018-02-07 13:40:46 +00:00
86e98c832a
Small code/doc changes
2018-02-07 14:20:18 +01:00
9bd044d9a7
Merge branch '38265-stuckcijobsworker-wrongly-detects-cancels-stuck-builds-when-per-job-timeout-is-more-than-an-hour' into 'master'
...
Resolve "StuckCiJobsWorker wrongly detects, cancels 'stuck' builds when per-job timeout is more than an hour"
Closes #38265 , #42196 , and #42750
See merge request gitlab-org/gitlab-ce!16756
2018-02-07 12:44:23 +00:00
c51eb79bbe
Merge branch 'master' into '26388-push-to-create-a-new-project'
...
# Conflicts:
# lib/gitlab/path_regex.rb
2018-02-06 19:14:43 +00:00
1b2400b529
Return only limited pagination headers for search API endpoints
2018-02-06 17:58:18 +01:00
1e56b3f476
Moves project creationg to git access check for git push
2018-02-06 16:52:29 +00:00
7381944565
Support search in API
2018-02-06 16:02:02 +01:00
28ef8cc56e
Add sorting options for /users API (admin only)
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-02-06 16:00:33 +02:00
dc229c076c
Abstracts ProjectMoved and ProjectCreated into a BaseProject
2018-02-06 13:35:35 +00:00
e42a548f1d
Move new project on push logic to a service
2018-02-06 13:35:35 +00:00
bc78ae6985
Add specs
2018-02-06 13:35:35 +00:00
32b2ff2601
Adds remote messsage when project is created in a push over SSH or HTTP
2018-02-06 13:35:35 +00:00
35882e681b
Adds option to push over SSH to create a new project
2018-02-06 13:35:35 +00:00
4ff15fcf8f
Merge branch 'api-guard' into 'master'
...
Make find_user_from_sources extensible for EE
See merge request gitlab-org/gitlab-ce!16924
2018-02-05 11:04:55 +00:00
4d64524b0d
Merge branch 'query-counts' into 'master'
...
Track and act upon the number of executed SQL queries
See merge request gitlab-org/gitlab-ce!16466
2018-02-05 10:04:43 +00:00
bd132dfe72
Make find_user_from_sources extensible for EE
2018-02-05 17:44:23 +08:00
3366f377c1
Merge branch 'master' into 38265-stuckcijobsworker-wrongly-detects-cancels-stuck-builds-when-per-job-timeout-is-more-than-an-hour
2018-02-04 23:38:59 +01:00
38c242126d
Refactor runner attribute caching implementation
2018-02-04 18:34:21 +01:00
eaada9d706
use Gitlab::UserSettings directly as a singleton instead of including/extending it
2018-02-02 18:39:55 +00:00
2057a6acde
port of 594e6a0a625^..f74c90f68c6
2018-02-01 12:14:46 -05:00
cca61980d5
Track and act upon the number of executed queries
...
This ensures that we have more visibility in the number of SQL queries
that are executed in web requests. The current threshold is hardcoded to
100 as we will rarely (maybe once or twice) change it.
In production and development we use Sentry if enabled, in the test
environment we raise an error. This feature is also only enabled in
production/staging when running on GitLab.com as it's not very useful to
other users.
2018-02-01 17:00:46 +01:00
2b6307f6ad
Enable RuboCop Style/RegexpLiteral
2018-02-01 02:06:07 +09:00
46a6edc731
Remove N+1 queries with /projects/:project_id/{access_requests,members} API endpoints
...
We can simplify the code quite a bit and improve performance by using
grape-entity merge fields:
https://github.com/ruby-grape/grape-entity/tree/v0.6.0#merge-fields
Relates to #42030
2018-01-30 21:46:09 -08:00
bdd3e39b0b
Move info update implementation to Ci::Runner model
2018-01-29 20:56:28 +01:00
395e500f01
Remove tap and use simplified method call
2018-01-29 16:29:25 -02:00
397442a061
Update runner info on all authenticated requests
2018-01-29 17:21:30 +01:00
b1c40590e7
Extend Runner API helpers with cache info storage
2018-01-29 00:23:36 +01:00
2944896466
Return more consistent values for merge_status on MR API
2018-01-28 18:50:43 -02:00
1db2f22b15
Revert "Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'"
...
This reverts merge request !16626
2018-01-25 11:12:14 +00:00
a349a4269c
Merge branch 'search-100' into 'master'
...
Use limit for search count queries
See merge request gitlab-org/gitlab-ce!16502
2018-01-24 20:21:40 +00:00
9f5390d81d
Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'
...
Return more consistent values for merge_status on V4 MR APIs
Closes #20639
See merge request gitlab-org/gitlab-ce!16626
2018-01-24 15:09:16 +00:00
45b62dfd32
Make the exposing of the Application secret more explicit
...
To make it more clear to developers that the entity exposes the
application secret, define a separate entity that only should be used
when the secret is needed (probably only on creation).
2018-01-24 09:44:07 +01:00
d38faa30ed
Add documentation about when the application API was added
2018-01-24 09:42:04 +01:00
81bbcfacb0
Add application create API
2018-01-24 09:42:04 +01:00
090ca9c33e
Use limit for search count queries
...
Search query is especially slow if a user searches a generic string
which matches many records, in such case search can take tens of
seconds or time out. To speed up the search query, we search only for
first 1000 records, if there is >1000 matching records we just display
"1000+" instead of precise total count supposing that with such amount
the exact count is not so important for the user.
Because for issues even limited search was not fast enough, 2-phase
approach is used for issues: first we use simpler/faster query to get
all public issues, if this exceeds the limit, we just return the limit.
If the amount of matching results is lower than limit, we re-run more
complex search query (which includes also confidential issues).
Re-running the complex query should be fast enough in such case because the
amount of matching issues is lower than limit.
Because exact total_count is now limited, this patch also switches to
to "prev/next" pagination.
Related #40540
2018-01-23 22:33:42 +01:00
dc84313e73
Return more consistent values for merge_status on MR API
2018-01-23 19:08:24 -02:00
583cff8d61
Default to Gitaly for 'git push' HTTP/SSH, and make Gitaly mandatory for SSH pull
2018-01-22 16:51:47 +00:00
c4904d570c
Merge branch '41673-blank-query-members-api' into 'master'
...
Resolve "Project/#/Members?query= blank causes 500 error"
Closes #41673
See merge request gitlab-org/gitlab-ce!16235
2018-01-22 15:27:15 +00:00
bd5bb6ee91
Merge branch '42231-protected-branches-api-route-returns-404-for-branches-with-dots' into 'master'
...
Resolve "Protected branches API route returns 404 for branches with dots"
Closes #42231
See merge request gitlab-org/gitlab-ce!16591
2018-01-22 08:45:36 +00:00
062f5b7126
Fix error on empty query for Members API
2018-01-21 16:36:55 +00:00
5a160b05ed
Fix protected branches API to accept name parameter with dot
2018-01-19 20:07:44 +00:00
795e546b1c
Resolve "Projects API: filter 'with_issues_enabled=true' returns projects with 'issues_enabled=false'"
2018-01-19 07:33:58 +00:00
8e9c073a14
Merge branch 'feature/merge-request-system-hook' into 'master'
...
System hooks for Merge Requests
See merge request gitlab-org/gitlab-ce!14387
2018-01-18 11:37:16 +00:00
d617c24f59
Merge branch '42129-fix-project-snippet-user-agent-detail' into 'master'
...
Fix the user-agent detail API endpoint for project snippets
Closes #42129
See merge request gitlab-org/gitlab-ce!16521
2018-01-18 11:18:44 +00:00
f351cc28c2
Merge branch 'sh-backport-10-3-4-security-fixes' into 'master'
...
Backport 10.3.4 security fixes into master
See merge request gitlab-org/gitlab-ce!16509
2018-01-17 20:26:59 +00:00
1a3bcc76ea
Fix the user-agent detail API endpoint for project snippets
2018-01-17 14:30:07 +00:00
d1eb3ff594
Make ruby lint happy
2018-01-17 11:42:32 -02:00
310d209b67
Adds sorting to deployments API
...
Adds sorting to deployments API through the `order_by` and sort
`fields`.
2018-01-17 08:47:55 +01:00
Sean McGivern
Nick Thomas
Jarka Kadlecová
Kamil Trzciński
Douwe Maan
Tiago Botelho
Dmitriy Zaporozhets
Rémy Coutable
Lin Jen-Shin
Matija Čupić
Mario de la Ossa
Micaël Bergeron
Yorick Peterse
Takuya Noguchi
Stan Hu
Oswaldo Ferreira
Toon Claes
Toon Claes
Nicolas MERELLI
Jan Provaznik
Jacob Vosmaer (GitLab)
Mark Fletcher
Jan Christophersen
Jacopo