8efc884166
Merge branch 'gitaly-tree-entries' into 'master'
...
Incorporate CommitService.GetTreeEntries Gitaly call
Closes gitaly#372
See merge request !12941
2017-07-21 15:47:36 +00:00
1ce523c133
Merge branch 'feature/migrate-commit-find-all-to-gitaly' into 'master'
...
Migrate Gitlab::Git::Commit.find_all to Gitaly
Closes gitaly#396
See merge request !12934
2017-07-21 14:28:48 +00:00
d0da585233
Merge branch 'improve-ee-compat-check' into 'master'
...
Developer can just download the patch from the `ee_compat_check` job's artifact
See merge request !12967
2017-07-21 14:06:27 +00:00
8348141434
Merge branch 'fix-re2-infinite-loop-nick' into 'security-9-3'
...
Fix an infinite loop in Gitlab:UntrustedRegexp
See merge request !2146
2017-07-21 13:13:07 +01:00
b043100b65
Migrate Gitlab::Git::Commit.find_all to Gitaly
...
Closes gitaly#396
2017-07-20 22:03:55 +02:00
9eb5cdd73f
Incorporate CommitService.GetTreeEntries Gitaly call
2017-07-20 12:47:00 -04:00
e0ab5618a0
Wrong data type when testing webhooks
2017-07-20 15:12:06 +00:00
ca80d589a6
Merge branch 'feature/send-diff-limits-to-gitaly' into 'master'
...
Migrate DiffCollection limiting logic to Gitaly
See merge request !12867
2017-07-20 14:31:06 +00:00
b80e6d7c17
Merge branch 'migration-status' into 'master'
...
Add option to specify migration status on at the migration site
See merge request !12976
2017-07-20 14:13:24 +00:00
542b675cf6
Merge branch 'fix/gb/fix-container-registry-tag-routing' into 'master'
...
Fix docker tag reference routing constraints
Closes #35220 and gitlab-com/support-forum#2246
See merge request !12961
2017-07-20 11:50:21 +00:00
4766a77b1d
Merge branch 'feature/gb/auto-retry-failed-ci-job' into 'master'
...
Make it possible to auto retry a failed CI/CD job
Closes #3442
See merge request !12909
2017-07-20 11:25:54 +00:00
001dd56e7b
Merge branch 'backstage/gb/build-stage-id-ref-bg-migration-cleanup' into 'master'
...
Implement build stage_id reference migration clean up
Closes #34893
See merge request !12785
2017-07-20 10:10:36 +00:00
ba60d4f6e4
Merge branch '24570-use-re2-for-user-supplied-regexp-9-3' into 'security-9-3'
...
24570 use re2 for user supplied regexp 9 3
See merge request !2129
2017-07-19 22:28:41 -05:00
b042765d2f
Merge branch '34563-usage-ping-github' into 'master'
...
Add github imported projects count to usage data
Closes #34563
See merge request !12959
2017-07-19 16:15:50 +00:00
ef2b81adb4
Migrate DiffCollection limiting logic to Gitaly
2017-07-19 18:05:22 +02:00
5d238ae819
Add option to specify migration status on at the migration site
2017-07-19 16:40:25 +01:00
55b981343b
Merge branch '35034-fix-unstranslated-visibility-levels' into 'master'
...
Always return the translated level name.
Closes #35034
See merge request !12852
2017-07-19 14:03:59 +00:00
2cc063e592
Add github imported projects count to usage data
2017-07-19 15:22:05 +02:00
0160aeed0a
Merge branch 'htve/gitlab-ce-34880_add_ukrainian_translations_to_i18n'
...
See merge request !12744 .
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-19 13:50:02 +02:00
98f5c00e7a
Merge branch 'master' into backstage/gb/build-stage-id-ref-bg-migration-cleanup
...
* master: (59 commits)
Resolve "Clarify k8s service keys"
Add Portuguese Brazil translations of Commits Page & Pipeline Charts
Add Japanese Translation to i18n
Update Prometheus gem to version that explicitly calls `munmap`
Simplify width for dropdown-menu on mobile
Update CHANGELOG.md for 9.3.7
Remove developer documentation about not describing symbols
Incorporate Gitaly's Commits#between RPC
Adapt to new Gitaly commit message format
Remove transitions on nav link hover
Provide option to trigger build only for official CE and EE repos in .com
Fix queries duration sorting in Performance Bar
Rename Project nav items
Add structured logging for Rails processes
Disable Rails logging in CI test environments
Fix download artifacts button alignment
Update avatar border to be opaque for better stacking
Fixed typos
Fix typos
Fix external issue trackers redirect
...
Conflicts:
db/schema.rb
2017-07-19 13:21:01 +02:00
2ddcb1f1a6
Merge branch '34881_add_russian_translations_to_i18n' into 'master'
...
Add Russian Translations To I18N
Closes #34881
See merge request !12743
2017-07-19 11:13:45 +00:00
1e66907971
Add Japanese Translation to i18n
2017-07-19 10:47:41 +00:00
23223ba64e
Do not allow to auto-retry a job more than 2 times
2017-07-19 11:27:49 +02:00
f9f33323aa
Developer can just download the patch from the `ee_compat_check` job's artifact
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-19 11:11:26 +02:00
fca7a77a23
Merge branch 'bvl-free-system-namespace' into 'master'
...
Free `system` namespace by moving uploads into `uploads/-`
Closes #33550
See merge request !12917
2017-07-19 09:09:15 +00:00
2c3d52161a
Update Prometheus gem to version that explicitly calls `munmap`
2017-07-19 08:54:39 +00:00
59c808a636
Add a test for container repository name regexp
2017-07-19 10:52:03 +02:00
1c7893c5c1
Merge branch 'rc/bump-peek-performance_bar' into 'master'
...
Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patch
See merge request !12939
2017-07-19 08:52:01 +00:00
1314b79d93
Merge branch 'gitaly-commits-between' into 'master'
...
Gitaly commits between
Closes gitaly#350
See merge request !12669
2017-07-19 08:51:22 +00:00
9f36012e02
Fix docker tag reference routing constraints
2017-07-19 10:30:57 +02:00
25b01b4c85
Incorporate Gitaly's Commits#between RPC
2017-07-18 16:20:27 -04:00
90f8feae46
Adapt to new Gitaly commit message format
2017-07-18 16:11:44 -04:00
3dcd3df531
Fix queries duration sorting in Performance Bar
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-18 19:00:46 +02:00
6f26f6f79f
Allow groups with the name system
2017-07-18 16:23:38 +02:00
c156030ef9
Add a background migration to rename `uploads` in the uploads table
2017-07-18 15:38:54 +02:00
11f9ac0a48
Merge branch 'backstage/gb/add-index-and-foreign-key-to-merge-requests' into 'master'
...
Add a foreign key to `merge_requests.head_pipeline_id`
Closes #34065
See merge request !12837
2017-07-18 13:09:25 +00:00
f3e682c03f
Merge branch 'request-store-wrap' into 'master'
...
Add RequestCache to cache via RequestStore
See merge request !12920
2017-07-18 12:09:47 +00:00
66c7f51897
Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patch
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-18 13:56:36 +02:00
3922b80329
Rename the methods to make it fit with current name
2017-07-18 18:04:20 +08:00
ffc5b29bd0
Follow feedback on the merge request
2017-07-18 17:48:48 +08:00
5cd6f8c76e
Add a foreign key to `merge_requests.head_pipeline_id`
2017-07-18 10:51:19 +02:00
2930c0e3d0
Remove obsolete argument from bg migrations code
2017-07-18 10:43:12 +02:00
a89f18bf2c
Renamed Gitaly services
2017-07-18 07:59:36 +00:00
76c9f071db
Update the comments for the new functionality
2017-07-18 01:30:58 +08:00
aada5273fa
Use RequestStoreWrap for Commit#author
...
We also try to use instance variable to cache the result if
RequestStore is not available, so we could keep the same logic,
using the same cache key. Also introduce a way to specify method
specific cache key
2017-07-18 01:18:20 +08:00
143fc48aba
Add RequestStoreWrap to cache via RequestStore
...
I don't like the idea of `RequestStore` at all, because it's just a
global state which shouldn't be used at all. But we have a number of
places calling `ProtectedBranch.protected?` and `ProtectedTag.protected?`
in a loop for the same user, project, and ref whenever we're checking
against if the jobs for a given pipeline is accessible for a given user.
This means we're effectively making N queries for the same thing over
and over.
To properly fix this, we need to change how we check the permission,
and that could be a huge work. To solve this quickly, adding a cache
layer for the given request would be quite simple to do.
We're already doing this in Commit#author, and this is extending that
idea and make it generalized.
2017-07-17 23:24:46 +08:00
32eaf46ead
Don't track cached queries in Gitlab::PerformanceBar::PeekQueryTracker
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-17 16:44:00 +02:00
5c4f99a360
Merge branch 'fix/gb/process-scheduled-background-migrations' into 'master'
...
Process scheduled background migrations as well
Closes #34951
See merge request !12787
2017-07-17 13:19:21 +00:00
e41d42d6a2
Simplify background migrations stealing code
...
Simply re-raise an exception when it occurs, but guarantee that no
background migration is lost in the process.
2017-07-17 14:02:12 +02:00
7cbdaef452
Expire cached user IDs that can see the performance after 5 minutes
...
If we don't expire the cached user IDs, the list of IDs would become
outdated when a new member is added, or when a member ios removed from
the allowed group.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-17 13:29:33 +02:00
Rémy Coutable
Robert Speicher
Sean McGivern
Ahmad Sherif
Alejandro Rodríguez
Alexander Randa
Kamil Trzciński
Yorick Peterse
Douwe Maan
Sean McGivern
Andrew Newdigate
Jarka Kadlecova
Grzegorz Bizon
Huang Tao
Paweł Chojnacki
Bob Van Landuyt
Lin Jen-Shin