a0548a2277
Merge branch '8584-move-ee-specific-code-from-gitbab-database-ee-gitlab-database' into 'master'
...
CE port of 'Move EE specific code from Gitbab::Database into ee'
See merge request gitlab-org/gitlab-ce!23361
2018-11-26 23:25:27 +00:00
5d82035f62
Merge branch 'sh-fix-hash-filename-handling' into 'master'
...
Fix handling of filenames with hash characters in tree view
Closes #54473
See merge request gitlab-org/gitlab-ce!23368
2018-11-26 23:04:22 +00:00
e8da70e66c
Fix handling of filenames with hash characters in tree view
...
Addressable::URI interprets the `#` in a URI as a URI fragment
and does not escape it, but Rails has special helpers that treats
these as bona-fide characters that need to be escaped.
Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23368
2018-11-26 14:14:48 -08:00
deaf3af7e5
Merge branch 'fix-deadlock-chunked-io' into 'master'
...
Fix deadlock on ChunkedIO
See merge request gitlab-org/gitlab-ce!23329
2018-11-26 21:16:40 +00:00
7bbcd7b59b
Merge branch 'force-reload-arguments-1' into 'master'
...
Rails 5 deprecation: Passing an argument to force an association to reload is now deprecated
See merge request gitlab-org/gitlab-ce!23337
2018-11-26 21:15:00 +00:00
5f8423dd85
CE port of 'Move EE specific code from Gitbab::Database into ee'
2018-11-26 17:14:05 -02:00
95ebdf3053
Merge branch '54327-profiler-doesn-t-work-with-auth-now' into 'master'
...
Allow profiler to authenticate by stubbing users directly
Closes #54327
See merge request gitlab-org/gitlab-ce!23320
2018-11-26 18:46:32 +00:00
4ec9009502
Merge branch 'ce-rd-extract-ee-specific-sidekiq-queue-config' into 'master'
...
Backport of gitlab-ee!8470
See merge request gitlab-org/gitlab-ce!23150
2018-11-26 17:55:21 +00:00
890addcbf3
Merge branch '53992-add-events-index-on-project-id-and-created-at' into 'master'
...
Add events index on project_id and created_at
Closes #53992
See merge request gitlab-org/gitlab-ce!23354
2018-11-26 17:43:54 +00:00
fb6281eab1
Merge branch 'sh-bump-better-errors-gem' into 'master'
...
Upgrade better_errors gem to 2.5.0
See merge request gitlab-org/gitlab-ce!23312
2018-11-26 17:30:42 +00:00
15b4a8f93a
Merge branch '54407-fix-limited-intersection-observers' into 'master'
...
Fix Image Lazy Loader for some older browsers
Closes #54407
See merge request gitlab-org/gitlab-ce!23349
2018-11-26 16:44:22 +00:00
cae50e42e7
Merge branch 'qa-followup-23267-for-qa-branches' into 'master'
...
Override CI_COMMIT_REF_SLUG for QA branches
See merge request gitlab-org/gitlab-ce!23346
2018-11-26 16:36:48 +00:00
ad7d1607d0
Add events index on project_id and created_at
2018-11-26 23:13:52 +08:00
b84b32ed3f
Passing an argument to force an association to reload is now deprecated
2018-11-26 15:46:14 +01:00
242baf1287
Merge branch 'ce-1979-move-mr-approval-settings' into 'master'
...
CE port of "Move merge request approval settings"
See merge request gitlab-org/gitlab-ce!23157
2018-11-26 14:40:57 +00:00
17756db81d
Override CI_COMMIT_REF_SLUG for QA branches
...
The `gitlab:assets:compile` job isn't run for the QA branches, thus
there's no Docker image correspinding these branches in the registry.
By overriding `CI_COMMIT_REF_SLUG` to `master` for QA branches, the
`fetch-assets` job in the `omnibus-gitlab` pipeline will pull the
`master` assets Docker image.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-11-26 15:08:01 +01:00
ba77dd3f3f
Merge branch 'gt-update-externalized-strings-from-app-views-project-runners' into 'master'
...
Update externalized strings from `/app/views/project/runners`
See merge request gitlab-org/gitlab-ce!23347
2018-11-26 13:56:25 +00:00
634344f769
Merge branch 'i18n-extract-app/views/shared-members' into 'master'
...
i18n: externalize strings from 'app/views/shared/members'
See merge request gitlab-org/gitlab-ce!23125
2018-11-26 13:48:46 +00:00
ab83c1e419
Use intersectionRatio to determine intersection
...
Some older browsers do not ship with isIntersecting, while they already
have IntersectionObserver support. We make use of `intersectionRatio`
now to fix the Lazy Loader for those browsers.
2018-11-26 14:29:34 +01:00
1c1b7a820d
Merge branch 'dm-batch-loader-key' into 'master'
...
Batch load only data from same repository when lazy object is accessed
See merge request gitlab-org/gitlab-ce!23309
2018-11-26 13:20:49 +00:00
5e8ea61ecd
i18n: externalize strings from 'app/views/shared/members'
...
Signed-off-by: Tao Wang <twang2218@gmail.com>
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-11-26 14:43:05 +02:00
c150772edb
Fix deadlock on ChunkedIO
2018-11-26 13:15:46 +01:00
f9c6134b60
Merge branch '40260-reduce-gitaly-calls-project-pipeline-status' into 'master'
...
Cache project HEAD to prevent unnecessary Gitaly calls
See merge request gitlab-org/gitlab-ce!23307
2018-11-26 12:14:35 +00:00
bf99a58852
Merge branch 'fix-null-variables' into 'master'
...
Allow to store null variables
Closes #54379
See merge request gitlab-org/gitlab-ce!23299
2018-11-26 11:53:01 +00:00
8587e09e17
Merge branch '7527-ci-variables-are-not-parameterized-for-alerting-rules-ce' into 'master'
...
CE Backport: Extract Gitlab::Prometheus::QueryVariables
See merge request gitlab-org/gitlab-ce!23335
2018-11-26 11:52:14 +00:00
4aa611053b
Merge branch 'winh-issue-board-switcher-vue' into 'master'
...
Refactor issue boards switcher to single file Vue component (CE-port)
See merge request gitlab-org/gitlab-ce!23274
2018-11-26 11:49:52 +00:00
35c1dfd132
Merge branch 'qa-193-ldap-group-sync-ce' into 'master'
...
CE port for qa-193-ldap-group-sync EE branch
See merge request gitlab-org/gitlab-ce!22834
2018-11-26 11:34:53 +00:00
f1a7e7fea1
Allow profiler to authenticate by stubbing users directly
...
Previously, we used a personal access token. This had a couple of
problems:
1. If the user didn't have a PAT, we couldn't impersonate them.
2. It depended on reading the raw PAT from the database.
Instead, we can monkey-patch the authentication methods on
ApplicationController (overriding the Devise ones), and remove them once
we're done. This does mean that profiles will not profile auth
correctly, so for that, use a PAT directly.
2018-11-26 11:18:03 +00:00
d895bdece9
Update externalized strings from `/app/views/project/runners`
2018-11-26 13:05:04 +02:00
b55aeca25e
Merge branch 'winh-vue-test-utils' into 'master'
...
Add @vue/test-utils as dev dependency
See merge request gitlab-org/gitlab-ce!23345
2018-11-26 10:23:44 +00:00
4b7e9eaacd
Treat Repository instances with the same disk path as the same hash key
2018-11-26 11:15:18 +01:00
5f0e4040ce
Batch load only data from same repository when lazy object is accessed
...
By specifying `key`, we get a different lazy batch loader for each
repository, which means that accessing a lazy object from one repository
will only result in that repository's objects being fetched, not those
of other repositories, saving us some unnecessary Gitaly lookups.
2018-11-26 11:15:18 +01:00
16a9080f9b
Merge branch 'gt-externalize-app-views-project-runners' into 'master'
...
Externalize strings from `/app/views/project/runners`
See merge request gitlab-org/gitlab-ce!23208
2018-11-26 09:54:26 +00:00
0c30052427
Use strong memoize utility
2018-11-26 17:41:41 +08:00
6bb1a2ab23
Update tests
2018-11-26 17:41:41 +08:00
3b49a7948c
Prevent loading from cache if commit is nil
2018-11-26 17:41:40 +08:00
5f11daf63c
Add changelog entry
2018-11-26 17:41:39 +08:00
0047429a97
Cache project HEAD to prevent unnecessary Gitaly calls
2018-11-26 17:41:39 +08:00
aed88cd40d
Merge branch 'docs/exclude-qa-frontend' into 'master'
...
Exclude qa-frontend from running on docs-only branches
See merge request gitlab-org/gitlab-ce!23327
2018-11-26 09:38:54 +00:00
00cbe6c9fd
Merge branch 'docs/ce-to-ee-no-squash' into 'master'
...
Instruct against squashing in CE to EE MRs
See merge request gitlab-org/gitlab-ce!23330
2018-11-26 09:24:16 +00:00
ac12301445
Merge branch 'ce-attempt-to-fix-lazy_loader_spec-transient-failure' into 'master'
...
Attempt to fix lazy loader spec transient failure
Closes #49511
See merge request gitlab-org/gitlab-ce!22918
2018-11-26 08:57:21 +00:00
1877eb49c0
Attempt to fix lazy loader spec transient failure
2018-11-26 08:57:21 +00:00
ceae9f5211
Merge branch 'sh-improve-prettier-docs' into 'master'
...
Fix documentation on using prettier for a specific directory
See merge request gitlab-org/gitlab-ce!23336
2018-11-26 08:54:27 +00:00
e3f56e2bbf
Add @vue/test-utils as dev dependency
2018-11-26 09:46:38 +01:00
b0eb112837
Merge branch 'gitaly-1.0.0' into 'master'
...
Use Gitaly 1.0.0
Closes gitaly#1406
See merge request gitlab-org/gitlab-ce!23323
2018-11-26 08:44:56 +00:00
3ea5a1b4c3
Merge branch '46544-webide-commit-shortcut' into 'master'
...
WebIDE: Make Ctrl+Enter automatically commit when commit textarea is focused
Closes #46544
See merge request gitlab-org/gitlab-ce!23049
2018-11-26 08:40:18 +00:00
4567713985
WebIDE: Make Ctrl+Enter automatically commit when commit textarea is focused
2018-11-26 08:40:18 +00:00
af798427a9
Delete 7527-ci-variables-are-not-parameterized-for-alerting-rules-ce.yml
2018-11-26 08:31:16 +00:00
10e4c87317
Merge branch 'patch-32' into 'master'
...
Update to properly reference users instead of projects
See merge request gitlab-org/gitlab-ce!23325
2018-11-26 08:30:09 +00:00
359a03c2bf
Merge branch '54462-master-pipeline-failing-due-un-prettify-file' into 'master'
...
Run `yarn prettier-all-save`
Closes #54462
See merge request gitlab-org/gitlab-ce!23342
2018-11-26 08:23:36 +00:00
Stan Hu
Douglas Barbosa Alexandre
Robert Speicher
Tim Zallmann
Rémy Coutable
Lin Jen-Shin
Jasper Maes
Filipa Lacerda
Fatih Acet
Dmitriy Zaporozhets
Lukas Eipert
Tao Wang
Kamil Trzciński
Grzegorz Bizon
Sean McGivern
George Tsiolis
Phil Hughes
Douwe Maan
Heinrich Lee Yu
Luke Bennett
Winnie Hellmann
Thomas Pathier
Achilleas Pipinellis
Steve Azzopardi