| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
|
|
|
|
|
|
| |
Prevent error when authorizing an admin-created OAauth application without a set owner
Closes #40086
See merge request gitlab-org/gitlab-ce!15349
(cherry picked from commit c608c25003906da8c934b99fc0d1bdf6f8e21c90)
ade23934 Prevent error when authorizing an admin-created OAauth application without a set owner
|
|
|
|
|
|
|
|
|
|
|
| |
Fix users autocomplete in a subgroup
Closes #39452
See merge request gitlab-org/gitlab-ce!15350
(cherry picked from commit 4a1e8188f96744103e51263c9bdc071c8e088690)
cf6ff601 Fix users autocomplete in a subgroup
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
into 'master'
Revert "add metrics tagging to the sidekiq middleware"
Closes #39958
See merge request gitlab-org/gitlab-ce!15285
(cherry picked from commit 43d98cd1ff3ea0dd6a794ba4d1d621415d439985)
7fd3ce41 Revert "add metrics tagging to the sidekiq middleware"
|
| |
|
|\
| |
| |
| |
| | |
Prepare 10.2 RC1 release
See merge request gitlab-org/gitlab-ce!15328
|
| |
| |
| |
| |
| |
| | |
Change Page::Main::Entry to only visit an entrypoint and introduce Page::Main::Login to handle actual log-in
See merge request gitlab-org/gitlab-ce!15283
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fix another timeout when searching for pipelines
Closes #39054
See merge request gitlab-org/gitlab-ce!15322
(cherry picked from commit 0517b9e341a2960c54faa69717628225ed50c418)
ec73ecb0 Fix another timeout when searching for pipelines
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Improve breadcrumbs clipping
Closes #37920
See merge request gitlab-org/gitlab-ce!15164
(cherry picked from commit 5d5d7f914c06a18dea567c8d90d0028fb3f86d07)
cb2d2bc3 Remove max-width on desktop
738aec70 Dynamically truncate breadcrumbs
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Icon Sprite URL needs to be local even if asset_host is set
See merge request gitlab-org/gitlab-ce!15289
(cherry picked from commit e482a4d59dae6437a64ae4ccbe6976ffced7b9ba)
25eea058 Icon Sprite URL is also local even if asset_host is set
81eaf171 Fixed URL Matching in Tests
687e7dea Put Icons Path in Helper
fb1b88de Missing the local url
01240a18 Fixed Function + Test based on MR
fce34b4b Removed Brackets
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Enables scroll to bottom once user has scrolled back to bottom in job log
Closes #34846 and #39109
See merge request gitlab-org/gitlab-ce!15260
(cherry picked from commit a030a4a8daf5abd0ef6a3339666b38cdc688fff8)
ce86fba0 Enables scroll to bottom once user has scrolled back to bottom in job log
62527afd Merge branch 'master' into 39109-reenable-scroll-job
0b5eda18 Improve naming and cache variables
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Add GitHub enterprise support to the GitHub Rake task and better handle rate limiting being disabled
See merge request gitlab-org/gitlab-ce!15284
(cherry picked from commit 760b2c75ef9d2c6acb655860dceae4c04cd8e5a7)
48cb1c50 Restore GH enterprise support in the Rake task
f37fe2ed Support importing GH projects without rate limits
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Prevent fast forward merge when rebase is required
Closes #39773
See merge request gitlab-org/gitlab-ce!15296
(cherry picked from commit f7537ce03a29b1af85461b2883c33bb41b2382d5)
bddbb90f Prevent fast forward merge when rebase is required
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Prevent OAuth phishing attack by presenting detailed wording about app to user during authorization
See merge request gitlab-org/gitlab-ce!15311
(cherry picked from commit 8331786cfafd8c7c20daa154f0cc744a5ae5022f)
ab1f3b47 Merge branch '32059-fix-oauth-phishing' into 'security-10-1'
24a3bee0 Add changelog entry for !2205
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Update installation.md to 10-2-stable
See merge request gitlab-org/gitlab-ce!15315
(cherry picked from commit 3e763fdac57f9bc89b6446ae8d106f777baf23dd)
723a788d Update installation.md to 10-2-stable
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Add Update guide for 10.2
See merge request gitlab-org/gitlab-ce!15316
(cherry picked from commit cfd8c605704dab0bfe649c38059dcc7a4d68e9db)
b065a375 Add Update guide for 10.2
97056de8 Move markdown file to correct path
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Update templates for 10.2
See merge request gitlab-org/gitlab-ce!15317
(cherry picked from commit 913c0bf52226d952edee1cd43559fbb1e03dd338)
a2bf79c9 Update templates for 10.2
|
|/
|
|
|
|
|
|
|
| |
Update licenses for 10.2
See merge request gitlab-org/gitlab-ce!15318
(cherry picked from commit 820c646cbba85b6a8696ad51c886f791f7ab4a3e)
874d876e Update licenses for 10.2
|
|
|
|
|
| |
Add 10.1.2 security fixes to CHANGELOG on master
See merge request gitlab-org/gitlab-ce!15305
|
|
|
|
|
|
|
|
|
| |
Fail when issuable_meta_data is called on an unlimited collection
Closes #39845
See merge request gitlab-org/gitlab-ce!15249
(cherry picked from commit 0c3877a48827b587b407174410196993bec79f73)
|
|
|
|
|
|
|
|
|
| |
Github enterprise support importer
Closes #39931
See merge request gitlab-org/gitlab-ce!15281
(cherry picked from commit 1d7e2a961aec86e50f3159ad3b82524e86b007c2)
|
|
|
|
|
|
|
|
|
|
|
| |
'master'
Fix issue 39935 : Add created_at and updated_at fields in MR payload
Closes #39935
See merge request gitlab-org/gitlab-ce!15274
(cherry picked from commit fec66bf7a163e14980f11d2f0370ce9c3630862b)
|
|
|
|
|
|
|
|
|
| |
Migrate GitLab::Git::Wiki.update_page to Gitaly
Closes gitaly#700
See merge request gitlab-org/gitlab-ce!15268
(cherry picked from commit ce06415cb6af38b5dab88d1babfe1888213a0684)
|
|
|
|
|
|
|
| |
Remove ineffective Vue service specs
See merge request gitlab-org/gitlab-ce!15277
(cherry picked from commit 14c0dc168a0e1fe2dfe67e6f9b20ff4adb431000)
|
|
|
|
|
|
|
|
|
| |
Fix Error 500 when pushing LFS objects with a write deploy key
Closes #39467
See merge request gitlab-org/gitlab-ce!15039
(cherry picked from commit 07ab4ad60a894d60ac561f9fdbd641fac90b4acc)
|
|
|
|
|
|
|
| |
Added file storage documentation and updated hash storage one
See merge request gitlab-org/gitlab-ce!15269
(cherry picked from commit 9e294180f29ec7ec9e9734a65b2b5d3124d657e4)
|
|
|
|
|
|
|
|
|
| |
Use Commit#notes and Note.for_commit_id when possible to make sure we use all indexes available to us
Closes #34509
See merge request gitlab-org/gitlab-ce!15253
(cherry picked from commit bf13746fd8c7af1ef2e28e8a5a46cf0229b31eb8)
|
|
|
|
|
|
|
| |
Make a note of which files to check in after externalizing strings
See merge request gitlab-org/gitlab-ce!15207
(cherry picked from commit f6fb47854974dfa44443555e0e8371053fd73e45)
|
|
|
|
|
|
|
|
|
| |
Resolve "Merge request widget - CI information has different margins"
Closes #38395
See merge request gitlab-org/gitlab-ce!15237
(cherry picked from commit baa64d590bd66f73a7afbfccd301a8a14f10513b)
|
|
|
|
|
|
|
| |
Fix test selection in Test::Integration::Mattermost
See merge request gitlab-org/gitlab-ce!15278
(cherry picked from commit 6f045671e665e42c7f354541e6804dda3c03438f)
|
|
|
|
|
|
|
|
|
| |
Rewrite the GitHub importer to perform work in parallel and greatly improve performance
Closes #33135, #38621, and #39361
See merge request gitlab-org/gitlab-ce!14731
(cherry picked from commit 92249f1ac883c2a861235ec49526cbafca73b362)
|
|
|
|
|
|
|
| |
Added missing strings to prepare the tags page for internationalization
See merge request gitlab-org/gitlab-ce!15256
(cherry picked from commit 3c369ba16e5c5a7d8a9f6187e08cb504c1ad91a6)
|
|
|
|
|
|
|
| |
Add Internal QA specs to the pipeline
See merge request gitlab-org/gitlab-ce!15240
(cherry picked from commit 133a2886b3d88bfdf7bb9e21e4e3d6727d516912)
|
|
|
|
|
|
|
|
|
| |
Change Sign Out route from a DELETE to a GET
Closes #39708
See merge request gitlab-org/gitlab-ce!15231
(cherry picked from commit b579cc7620dad1d406e974cce2d9ad5a4ce58a57)
|
|\
| |
| |
| |
| | |
Cleanup tests
See merge request gitlab-org/gitlab-ce!15261
|
| | |
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
When deleting merged branches, ignore protected tags
Closes #39732
See merge request gitlab-org/gitlab-ce!15252
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In gitlab-org/gitlab-ce!13251 wildcard Protected Branches were handled
properly when deleting all merged branches. But this fix wasn't that
good. It also checked branch names against Protected Tags. That's not
correct.
This change will **only** check if there is a Protected Branch
matching the merged branch, and ignores Protected Tags.
Closes gitlab-org/gitlab-ce#39732.
|
|\ \ \
| | | |
| | | |
| | | |
| | | | |
Free some reserved group routes
See merge request gitlab-org/gitlab-ce!15052
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
'master'
Make BackgroundTransaction#labels public
See merge request gitlab-org/gitlab-ce!15257
|
| | | | |
| | | | |
| | | | |
| | | | | |
as are all other Transaction implementations
|
|\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
fix karma config file
See merge request gitlab-org/gitlab-ce!15263
|