| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| | |
|
| |
|
|
|
|
|
| |
Don't autolink unsafe protocols
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23153
See merge request !2013
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Use separate queues for all Sidekiq workers
## What does this MR do?
This MR updates all workers so that they (mostly) use their own Sidekiq queues. This in turn allows us to monitor queues more accurately and in the future impose queue specific throttles, limits, etc.
This is a critical part we need in 8.13, despite it being so close to release day.
See https://gitlab.com/gitlab-org/gitlab-ce/issues/23370 for more information.
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/23370
See merge request !7006
|
| |
|
|
| |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
Fixed compare ellipsis messing with layout
## What does this MR do?
Fixed a bug where the ellipsis would cause the form to mess with the layout.
## Screenshots (if relevant)
See merge request !7042
|
| |
|
|
|
|
|
| |
Change "Group#web_url" to return "/groups/twitter" rather than "/twitter"
Fixes #23527
See merge request !7035
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Disable warming of the asset cache in Spinach tests under CI
I suspect some combination of Knapsack tests cause no regular Rack tests
to be loaded (i.e. all JavaScript tests), which leads to the error:
ArgumentError: rack-test requires a rack application, but none was given
In CI, we precompile all the assets so there is no need to warm the
asset cache in any case.
Closes #23613
See merge request !7033
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix broken label uniqueness label migration
The previous implementation of the migration failed on staging because
the migration was attempted to remove labels from projects that did not
actually have duplicates. This occurred because the SQL query did not
account for the project ID when selecting the labels.
To replicate the problem:
1. Disable the uniqueness validation in app/models/label.rb.
2. Create a duplicate label "bug" in project A.
3. Create the same label in project B with label "bug".
The migration will attempt to remove the label in B even if there are no duplicates.
To fix the issue, include the project ID when selecting the labels.
Closes #23609
See merge request !7030
|
| |
|
|
|
|
|
| |
Use iid deployment refs
This fixes the 404, because `find_by` will return nil instead of throwing an error.
See merge request !7021
|
| |
|
|
|
|
|
| |
Ignore external issues when bulk assigning issues to author of merge request.
Fixes #23552
See merge request !7020
|
| |
|
|
|
|
|
| |
Preserve note_type and position for notes from emails
Closes #23208
See merge request !7010
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix GitLab project import when a user has access only to their default namespace
## What does this MR do?
It fixes a bug when a namespace ID was not passed to `/import/gitlab_project/new` page. It occurred when a user have no choice of the namespace, so we did not render the input for namespace ID. This MR introduces a hidden input for the described case.
## Does this MR meet the acceptance criteria?
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Fixes #23507
See merge request !6995
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fixed issues with sticky mr tabs & sidebar
## What does this MR do?
- Fixes an issue where opening the sidebar wouldn't update the merge request tabs width & positioning
- Fixes issues when resizing the browser
Rather than updating the JS to react to different methods, this way allows the CSS to keep control of the positioning & sizes.
## What are the relevant issue numbers?
Closes #23504
See merge request !6990
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Fix project member access levels
Migrate invalid project members (owner -> master)
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18616
See merge request !6957
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| |
|
|
|
|
|
| |
Create protected branches bundle
Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/645
See merge request !6909
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
'22457-reset-filters-button-should-be-invisible-when-no-filters-are-active' into 'master'
`Reset filters` link should only be visible when filters are active
## Why was this MR needed?
`Reset filters` link is always visible.
Closes #22457
See merge request !6497
|
| |
|
|
|
|
|
| |
Fixes error 500 on Runners page (`ActionView::Template::Error (Missing partial kaminari/_paginator`)
Originally reported downstream: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=819903
See merge request !5701
|
| |
|
|
|
|
|
|
|
| |
[Doc] Fix `ref` parameter name for `commits/statuses`
The attribute to filter by branch or tag needs to be named `ref`, not `ref_name`. And indeed the attribute in the JSON response is `ref` (and not `ref_name`).
Tested on Gitlab CE 8.9.
See merge request !4876
|
| | |
|
| |
|
|
|
| |
Check that user has access to a given namespace to prevent leaking namespace names.
See merge request !2009
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
Restrict ProjectCacheWorker jobs to one per 15 min
## What does this MR do?
This restricts performing ProjectCacheWorker jobs to once every 15 minutes per project. The goal of this is to reduce disk load in the event of a lot of pushes happening in a short period of time.
The impact is that cached data (e.g. commit count) may be updated less frequently. Furthermore it could mean that separate push payloads won't lead to e.g. READMEs being updated. Most of the cached data isn't updated very frequently, so this trade off should be worth it considering the alternative is a burning storage layer.
In the future we'll have to flush caches in a smarter way. For example, refreshing the README cache could probably be done separately from the other caches with its own lease and such. See https://gitlab.com/gitlab-org/gitlab-ce/issues/23550 for more information.
See merge request !7017
|
| |
|
|
|
| |
Make label API spec independent of order
See merge request !7013
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Resolve "Breaking a parameter table in Projects API doc"
## What does this MR do?
- A broken markdown in `Search for projects by name` is fixed.
- cf. !6681
- Pagination is removed from `Search for projects by name` like other docs as it is shown in [/api/README.html](https://docs.gitlab.com/ce/api/README.html)
## Moving docs to a new location?
No.
## What are the relevant issue numbers?
Closes #23555
See merge request !7007
|
| |
|
|
|
|
|
|
|
| |
Remove show_menu_above attribute from issuable dropdowns.
Removes `show_menu_above` attribute form issueable dropdowns so they will drop down.
Fixes #23425 and #23317
See merge request !7001
|
| |
|
|
|
|
|
|
|
| |
Bump `omniauth-saml` to 1.7.0
Bump `omniauth-saml` to 1.7.0 to include security fixes and metadata support for IdP auto-configuration.
cc @dblessing @dewetblomerus
See merge request !6997
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix a 500 error viewing an MR with a deleted source project
## What does this MR do?
Allows merged MRs to be shown without any 500 errors if the source project is removed
## Are there points in the code the reviewer needs to double check?
https://gitlab.com/gitlab-org/gitlab-ce/commit/31c37c6c38258684fc92e0d91119c33872e39034 fixed this for closed MRs only. I had trouble understanding the introduced helper and logic, so reverted it and keyed everything on the existence of the source project or branch directly.
commits.json returns a 500 error for a closed or merged MR; the approach taken in the above MR was to hide the commits... tab, so I've run with that.
For merged MRs, the commits (but not the pipeline data) are in the target project, so we *could* do better, but it's a fairly nasty intervention to make it happen.
## Why was this MR needed?
Viewing merged MRs should work even if the fork they came from has been deleted or unlinked.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #23341
See merge request !6991
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Update duration at the end of pipeline
## What does this MR do?
Moves duration calculation to be done only once at the end of pipeline processing.
Currently this is done every one build.
## Why was this MR needed?
This is the simplest thing that we can do before properly implementing duration calculation: https://gitlab.com/gitlab-org/gitlab-ce/issues/23523#note_17145614
This is ~Performance improvement that significantly affects: http://performance.gitlab.net/dashboard/db/sidekiq-workers?var-worker=PipelineUpdateWorker%23perform&var-database=Production&from=now-1h&to=now
See merge request !6987
|
| |
|
|
|
|
|
|
|
|
|
| |
Keep around commits only on pipeline create
## What does this MR do?
Since the pipeline SHA doesn't change, we don't need to update keep arounds every save.
## Why was this MR needed?
This is minimal change to fix this: https://gitlab.com/gitlab-org/gitlab-ce/issues/23503
See merge request !6986
|
| |
|
|
|
|
|
| |
Revert issuable title reordering
Reverts !6503, and uses `to_reference` rather than `iid` for `Issues#show` and `Issues#edit` titles.
See merge request !6983
|
| |
|
|
|
|
|
|
|
| |
Fix name of feature that restricts access to builds traces
## What does this MR do?
This MR fixes the name of the feature that makes it possible to restrict build traces. This does not disable access to pipelines. Pipelines are still available so we should tie the name with builds, instead of using work "pipeline" there.
See merge request !6980
|
| |
|
|
|
|
|
| |
Improve error logging of MergeService
Relates to #23505
See merge request !6975
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
'master'
Fix 'No label' and 'Any label' filters
## What does this MR do?
Returns the `title`as the `id` for `No label`.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
Label filters not working as expected
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #23375
See merge request !6974
|
| |
|
|
|
|
|
|
|
|
|
| |
Fix pipeline alignment
Before:
<img src="/uploads/8169695c5e594ee3f42a73cc1a91fd1a/Screen_Shot_2016-10-18_at_6.58.49_PM.png" width="400px">
After:
<img src="/uploads/d608380057ef66223925db3524f691fb/Screen_Shot_2016-10-18_at_7.04.15_PM.png" width="400px">
See merge request !6971
|
| |
|
|
|
|
|
| |
Fix missing semicolon to make scss-lint happy
Builds were failing: https://gitlab.com/gitlab-org/gitlab-ce/builds/5256491
See merge request !6969
|
| |
|
|
|
|
|
| |
Fix broken award emoji for comments
Closes #23506
See merge request !6967
|
| |
|
|
|
|
|
|
|
| |
Add missing Vue dependency
Cycle Analytics is broken because vueJS is not included.
This feature will be improved on its second iteration, and also tests will be aded so this won't happen again.
See merge request !6965
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Set webkit-overflow-scrolling to auto for children of body.
## What does this MR do?
Fixes weird tooltip layering behavior in iOS Safari. See screenshots and/or the original issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/22816
## Why was this MR needed?
Tooltips were cutoff in Safari.
## Screenshots (if relevant)
Before:
After:
Also, as part of this fix, I removed applications of `-webkit-overflow-scrolling: auto` in two other places where they're no longer needed. One was the file-holder. I made sure I could reproduce the behavior this was intended to fix, and then made sure this MR still fixed it.
Here's the errant behavior:
Here's what it looks like with this MR:
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
See merge request !6962
|
| |
|
|
|
|
|
| |
Backport git access spec changes from EE
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/645#note_16391185
See merge request !6961
|
| |
|
|
|
|
|
|
|
| |
Fixed height of issue board blank state
## What does this MR do?
The height of the issue board blank state was causing some weird scrolling issues. This MR changes the height of the blank state.
See merge request !6960
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Wait for ajax for every merge request spinach test
## What does this MR do?
* removes duplicate `WaitForAjax` module
* ensure we run `wait_for_ajax`after each MR spinach tests
## Why was this MR needed?
Because when visit MR page we do ajax call to check CI status. When testing this page with spinach and JS driver we got random failing tests. It happens because of race condition db cleaner drop data before ajax call finished. So we make sure that every MR spinach scenario with js driver waits for ajax before running next scenario
## What are the relevant issue numbers?
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23461
See merge request !6959
|
| |
|
|
|
| |
fix: commit messages being double-escaped in activities tab
See merge request !6937
|
| |
|
|
|
|
|
|
|
|
|
| |
Stop event_commit_title from escaping its output
Fixes a double-escape issue (actually triple-escape!) viewing the activity feed
Closes #23311
Related to #23258 !6832
See merge request !6930
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Change input order on Sign In form for better tabbing.
## What does this MR do?
This unreverts 8751491b, which was mistakenly reverted in !6328. It also changes the implementation of the original commit to work with the new login styling and markup.
cc: @ClemMakesApps
## Screenshots (if relevant)
(Disregard the grey borders on invalid inputs -- for some reason, Gifox isn't picking up some colors for me :shrug: )
## Does this MR meet the acceptance criteria?
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- Tests
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6867
See merge request !6928
|
| |
|
|
|
|
|
| |
Create project feature when project is created
closes #22944
See merge request !6908
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Smaller min-width for MR pipeline table
## What does this MR do?
Nests class under `.tab-pane` to make sure buttons don't get cut off
## Screenshots (if relevant)
## What are the relevant issue numbers?
Closes #23346
See merge request !6893
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
API: Fix Sytem hooks delete behavior
## What does this MR do?
This corrects the delete API for system hooks. Returning 200 is not the right way indicating a hooks is not found.
## What are the relevant issue numbers?
Discussed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6861/diffs#609af00c90e3d5241064d1404e3e018a3235634a_64_62
See merge request !6883
|
| |
|
|
|
|
|
|
|
|
| |
'master'
Add Nofollow for uppercased external url protocols
Closes #22782
See merge request !6820
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Triggered pipelines
#### What does this MR do?
Separates trigger into its own column
#### Screenshots (if relevant)
#### What are the relevant issue numbers?
Closes #19991
See merge request !6753
|
| |
|
|
|
|
|
| |
Prevent wrong markdown on issue ids when project has Jira service activated
fixes gitlab-org/gitlab-ee#828
See merge request !6728
|
