| Age | Commit message (Collapse) | Author |
|---|
|
Closes #19307
|
|
Add link to article on how to write reliable, asynchronous tests with Capybara
This article has been incredibly useful for all developers. Adding a link to it so more people can refer to it.
See merge request !6312
|
|
Hides tooltip on discussion toggle button when clicking
## What does this MR do?
Hides the tooltip when clicking the discussion toggle button.
Rather than triggering the tooltip to hide we trigger blur. This is because of how _amazing_ Bootstraps tooltips are. They are shown also on focus so if we trigger the tooltip to hide & then mouseover the button again the tooltip still shows.
## What are the relevant issue numbers?
Closes #20750
See merge request !6303
|
|
Fixed issue boards loading issues on large screens
## What does this MR do?
On larger screens it is possible for 20 issues to load (this is the amount per page) & there still to be room underneath the last issue which means the list can't scroll stopping the infinite scrolling working.
This MR checks if there are more issues to load, if there are & the height of the scroll area is less than or the same as scroll height then more issues are loaded. This will keep happening until it is possible to scroll, once it is possible to scroll it goes back to the default behaviour of the infinite scrolling.
## What are the relevant issue numbers?
Closes #22092
See merge request !6319
|
|
Fix issuable templates dropdown for forked projects
fixes #21824
See merge request !6329
|
|
Added group-specific setting for LFS.
Groups can enable/disable LFS, but this setting can be overridden at the project level. **Admin only**
Closes #18092
See merge request !6164
|
|
Bump rubocop-rspec to 1.7.0
See merge request !6357
|
|
Fix spelling: sucessfully -> successfully
Originally from gitlab-org/gitlab-ee!682
See merge request !6376
|
|
Sort secret keys by key instead of id.
Closes #20870
See merge request !6275
|
|
Fix undefined method when reverting migration `RemoveProjectsPushesSinceGc`
See merge request !6375
|
|
CI stages
#### What does this MR do?
Removes individual columns for each stage, consolidating them into one `Stages` column
#### Screenshots (if relevant)
#### What are the relevant issue numbers?
Closes #21925
See merge request !6338
|
|
|
|
|
|
|
|
|
|
|
|
Originally from gitlab-org/gitlab-ee!682
|
|
|
|
Added keyboard shortcut to navigate to issue boards
## What does this MR do?
Adds a keyboard shortcut of `g l` to navigate to issue boards.
`g b` would work nicer. However that is taken by builds. Open to suggestions.
## What are the relevant issue numbers?
Closes #21218
See merge request !6248
|
|
'master'
Update snippets UI
## What does this MR do?
Updates snippets UI _(mainly mobile view)_ to new UI proposed in #18849.
## Are there points in the code the reviewer needs to double check?
Does anyone know the implementation difference between `app/views/snippets/show.html.haml` and `app/views/projects/snippets/show.html.haml`? I have only been updating the latter as it's the only one I can find implemented. I assume the former is rendered somewhere seeing as there is controllers for it too. But this doesn't seem very DRY from my current perspective.
## Why was this MR needed?
## 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 you do - 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 #18849
See merge request !6210
|
|
Restore gl_dropdown.js changes
Restores `fieldName` to allow only string values. `fieldName` was changed to accept function as a value in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/581 Since the approach changed in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/687 there's no need to accept function as value.
Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/687
EE Issue: https://gitlab.com/gitlab-org/gitlab-ee/issues/919
See merge request !6234
|
|
Added wait for vue helper
|
|
Closes #21218
|
|
|
|
|
|
|
|
|
|
'master'
Reduce duplication in `Commits::{CherryPickService,RevertService}`
## What does this MR do?
This factorize similar code from `Commits::{CherryPickService,RevertService}`.
## Why was this MR needed?
To get rid of flay offense.
## What are the relevant issue numbers?
Closes #22203
See merge request !6366
|
|
|
|
|
|
|
|
Groups can enable/disable LFS, but this setting can be overridden at the project level. Admin only
|
|
Improve validity of spec/features/todos/todos_filtering_spec.rb
Previously, we were checking that a CSS selector string didn't have some
page-related content, which, of course it didn't.
Now we check against the actual content of the selector, we use a more
semantic selector, and we add an additional expectation for the text
that _should_ be there, as an additional sanity check.
See merge request !6356
|
|
Update references to deprecated `repos_path` configuration key to avoid
## What does this MR do?
Update references to deprecated `repos_path` configuration key to avoid errors when updating GitLab from older versions
## Why was this MR needed?
Users were reporting errors when upgrading from GitLab 6.7
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1464
See merge request !6350
|
|
Group similar builds
We group builds by removing from the builds name two numbers which are delimited by whitespace or colon:
* `name 0 1` => `name`
* `name 0:1` => `name`
* `name 0/1` => `name`
* `name 0:1 ruby` => `name ruby`
* `name 0/1 ruby` => `name ruby`
* `0 1 name ruby` => `name ruby`
* `0:1 name ruby` => `name ruby`
* `0/1 name ruby` => `name ruby`
See merge request !6242
|
|
Trigger autosize update after template selection
## What does this MR do?
Triggers an autosize update after selecting an issue template.
The autosize plugin doesn't react to value changes and therefore doesn't automatically update when the user selects the template. This merge request adds it so that it detects if the editor the template selector is a jQuery object (not Ace editor) & then triggers the autosize event to allow the user to scroll the textarea.
## Screenshots (if relevant)
## What are the relevant issue numbers?
Closes #21982
See merge request !6282
|
|
doc/ci/quick_start/README: improve sentence about link to a Lint tool
## What does this MR do?
It improves the `doc/ci/quick_start/README.md` documentation.
## Are there points in the code the reviewer needs to double check?
The reviewer can check that there is no more **CI settings** menu and that the Lint tool can be accessed under **Pipelines > Pipelines** and **Pipelines > Builds**.
## Why was this MR needed?
Because the CI quick start documentation was not correct.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
It is not a code change so I don't think the below criteria are relevant.
- [ ] [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 you do - 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?
I didn't check if there was an issue for this.
See merge request !6301
|
|
doc/user/permissions: update option and menu names
## What does this MR do?
This fixes `doc/user/permissions.md` documentation.
## Are there points in the code the reviewer needs to double check?
The reviewer can check that the name of the option is now **Public pipelines** and that this option is in **Project Settings > CI/CD Pipelines**.
## Why was this MR needed?
Because the previous name of the option and of the menu had not been updated in `doc/user/permissions.md` when they were changed.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
This is a documentation only MR, so I don't think it needs to pass all these 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 you do - 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?
I don't know of any issue number.
See merge request !6302
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Fixed add to tree button on mobile
## What does this MR do?
Fixes an issue with the width of the add to tree button on mobile.
This was caused by acde2e30b62ca7adaae2a7afd75f09f7a56be58e adding `100%` width for mobile.
## Screenshots (if relevant)
## What are the relevant issue numbers?
Closes #22128
See merge request !6339
|
|
Fix the ordering of transition callbacks
Because pipeline status could be changed for the builds in the next
stages, if we process next stages first, the current build would be
out of synchronized, and would need a reload for that matter.
Alternatively, like what I did in this commit, we could process the
next stages later (by using `after_transition` rather than
`around_transition`), and complete what're doing for the current
build first. This way we don't have to reload because nothing is
out synchronized.
Note that since giving `false` in `after_transition` would halt the
callbacks chain, according to:
https://github.com/state-machines/state_machines-activemodel/blob/v0.4.0/lib/state_machines/integrations/active_model.rb#L426-L429
We'll need to make sure we're not returning false because we don't
intend to interrupt the chain.
This fixes #22010.
After this fix, both pipeline events and build events would only show
up once.
See merge request !6305
|
|
'master'
Simplify the 'Implement design & UI elements' section in CONTRIBUTING
There's a nice documentation page in the gitlab-design page, so just link to it!
See merge request !6249
|
|
Clean environment variables when running git hooks
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20977
See merge request !6344
|
|
Bump rubocop to 0.42.0
Also updates `.rubocop_todo.yml` for the latest cops.
See merge request !6354
|
|
|
|
Allow flay and flog to fail for now
flay and flog started working somehow (despite #17858). Disabling them for now since the broken builds are impeding progress.
See merge request !6360
|
|
|
|
Ignore SVG whitelist code from flay
The SVG whitelist code was generated from table definitions, and simplifying it would actually make it harder to read.
See merge request !6361
|
|
errors on updates from older versions
|
|
|
