| Age | Commit message (Collapse) | Author |
|---|
|
Issue #4270: Recursive option for files through API
## What does this MR do?
- Adds recursive param to tree API request. With this param we can get all repository paths in a single request.
- Related [old github pull request](https://github.com/gitlabhq/gitlabhq/pull/9311)
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
Requested in #4270
## Screenshots (if relevant)
## 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)
- [X] API support added
- Tests
- [X] Added for this feature/bug
- [x] All builds are passing
- [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 you do - 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?
Requested in #4270
See merge request !6088
|
|
Add button to delete all merged branches
## What does this MR do?
It adds a button to the branches page that the user can use to delete all the branches that are already merged. This can be used to clean up all the branches that were forgotten to delete while merging MRs.
**Note**
~~This MR is WIP until MR !6408 is merged.~~
## Are there points in the code the reviewer needs to double check?
The UX of the actual "Delete merged branches" button.
## Why was this MR needed?
Fixes #21076
## Screenshots
Before:
After:
## 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)
- [x] API support added
- 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 you do - 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 #21076
See merge request !6449
|
|
Fix Error 500 when creating a merge request that contains an image that was deleted and added
_Originally opened at !4816 by @stanhu._
- - -
## What does this MR do?
This MR fixes an Error 500 when creating a merge request that contains an image that was deleted and added. Before, when displaying the before and after image, the code would always retrieve the image from the parent commit. However, in a diff, this could cause two different problems:
The "before" image may not actually be the image you want to compare against (regression of #14327)
It may appear as though a file was modified when it was really just added during the diff
## Are there points in the code the reviewer needs to double check?
There may be a more elegant to fix this bug.
## What are the relevant issue numbers?
Closes #3893, gitlab-org/gitlab-ee#678
See merge request !7457
|
|
Omniauth auto link LDAP user falls back to find by DN when user cannot be found by uid
Unfortunately, SAML IDs can be an LDAP UID, DN, or something else entirely. UID and DN are most common, though. This adds a fallback scenario so we first try to find a matching LDAP user by UID, then by DN. This will fix a problem for the customer in https://gitlab.zendesk.com/agent/tickets/43298
See merge request !7002
|
|
Issue #13823: random message when all Todos are Done
## What does this MR do?
Shows a random message every time the To Do list is empty: https://gitlab.com/gitlab-org/gitlab-ce/issues/13823
## Are there points in the code the reviewer needs to double check?
It's my first contribution to GitLab so I might need some help:
- I'm loading a yaml file in the controller. I'm not sure where would be the best place to put it.
- I'm also having the error below running the tests but it doesn't seem related to my changes. I think I might have some issue with my config. Could you double check if the tests pass for you?
/home/pep/.rvm/gems/ruby-2.3.1/gems/actionpack-4.2.7.1/lib/action_dispatch/middleware/debug_exceptions.rb:21:in `call': No route matches [GET] "/autocomplete/users/sjobs@apple.com.json" (ActionController::RoutingError)
## Why was this MR needed?
https://gitlab.com/gitlab-org/gitlab-ce/issues/13823
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [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
- [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?
https://gitlab.com/gitlab-org/gitlab-ce/issues/13823
See merge request !6818
|
|
Fixed issue boards when not logged in
## What does this MR do?
This managed to get through because their wasn't actually any tests for loading the lists when a user is not logged in. This fixes that by adding a test & also fixing the template not correctly compiling under VueJS v2.
See merge request !7452
|
|
deleted and added
Steps to reproduce:
1. Start with a repo with an image
2. Add a commit to delete the image
3. Add another commit to replace the image with another image
In a diff comparison, we really just compare about what the image was before the diff, not
the direct parent of the last commit. This MR fixes that.
Closes #3893, gitlab-org/gitlab-ee#678
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
Improve naming convention in ci configuration module
## What does this MR do?
This MR improves the naming convention in CI configuration module to reflect the domain design better.
## What are the relevant issue numbers?
Related to #15060
See merge request !7448
|
|
Fix error links in help index page when access it with url `http://gitlab.example.com/help/` which have an extra slash
Fixes #24349
See merge request !7396
|
|
Centralized all LDAP config logic in to `Gitlab::LDAP::Config`. We had varying configuration for devise/omniauth and other things. For example, `user_filter` was never taken in to account for devise/omniauth so a user object would always be created, even if the user did not match the user_filter.
Fixes gitlab-org/gitlab-ce#21195, https://gitlab.com/gitlab-org/gitlab-ce/issues/15396 and gitlab-org/gitlab-ce#13296
See merge request !6606
|
|
Fix project Visibility level selector not using default values
closes #20245
See merge request !7264
|
|
Added ability to put emojis into repository name
## Are there points in the code the reviewer needs to double check?
Ensure that regexp used is correct, I used the following list: http://www.unicode.org/Public/emoji/1.0/emoji-data.txt
See merge request !7420
|
|
|
|
|
|
Resolve "Link from build page to its pipeline"
## What does this MR do?
Adds references and links to a build's pipeline within both individual build pages and the build index.
## Are there points in the code the reviewer needs to double check?
Nothing springs to mind
## Why was this MR needed?
See #22307
## 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
- 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?
Closes #22307
See merge request !7082
|
|
|
|
|
|
Added ability to put emojis into repository name
|
|
- Also remove unnecessary param
|
|
Centralize all LDAP config logic in `GitLab::LDAP::Config`. Previously,
some logic was in the Devise initializer and it was not honoring the
`user_filter`. If a user outside the configured `user_filter` signed
in, an account would be created but they would then be denied access.
Now that logic is centralized, the filter is honored and users outside
the filter are never created.
|
|
Update 8.14-rc1 migrations to minimize downtime and deploy time
## What does this MR do?
Modify 8.14-rc1 migrations and code to minimize downtime and deploy time
## Are there points in the code the reviewer needs to double check?
No
## Why was this MR needed?
8.14-rc1 migrations took too much time in staging, so we didn't want to take too much downtime in production
## 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?
Closes #24386
See merge request !7427
|
|
|
|
Ensure labels are loaded for all "show" methods of MR Controller
Closes #24397
See merge request !7416
|
|
See https://gitlab.com/gitlab-org/gitlab-ce/issues/24386
|
|
Allow certain Sidekiq jobs to be throttled
## What does this MR do?
Allows certain slow running Sidekiq jobs to be throttled. It is disabled by default and can be enabled via the Application Settings.
## 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)
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
## What are the relevant issue numbers?
Related to #23352
See merge request !7292
|
|
Migration to Vuejs version 2
List of required changes for our Vue usages
- `init` :arrow_right: `beforeCreate`
- `read` :arrow_right: `mounted`
- `$els` :arrow_right: `$refs`
- :no_entry_sign: `$remove` completely removed. :white_check_mark: Use `indexOf` and `splice`
- :no_entry_sign: HTML embedding with `{{{ }}}` is deprecated. :white_check_mark: Use `v-html`
See merge request !7254
|
|
Previously, they were only being loaded on the actual `show` action, but
not the actions representing the tabs (commits, builds, etc).
|
|
|
|
19205 Redesign group page header to match new navigation
## What does this MR do?
Redesigns group page to match comps
## Screenshots (if relevant)
Before:
After:
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 #19205
See merge request !7363
|
|
Fix the collapsed diff when converting a symlink to a regular file
#21610
!6828
See merge request !6953
|
|
|
|
found by uid
|
|
|
|
In this case comparing old_path and new_path is not enough because there
are two entires that match.
|
|
|
|
|
|
|
|
Grapify triggers API
## What are the relevant issue numbers?
Related to #22928
See merge request !7378
|
|
'master'
Fix error when using invalid branch name when creating a new pipeline
## What does this MR do?
This MR fixes `500` error when creating a new pipeline though user interface ("Run pipeline")
## Are there points in the code the reviewer needs to double check?
Is this a good approach to catch those exceptions on `Repository` level?
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- Tests
- [x] Added for this feature/bug
## What are the relevant issue numbers?
Closes #23982
See merge request !7324
|
|
Grapify milestones API
## What are the relevant issue numbers?
Related to #22928
See merge request !7373
|
|
|
|
Grapify runners API
## What are the relevant issue numbers?
Related to #22928
See merge request !7377
|
|
|
|
|
|
Grapify the session API
## What are the relevant issue numbers?
Related to #22928
See merge request !7381
|
|
Add api endpoint `/groups/owned`
See merge request !7103
|
|
|
|
It adds a button to the branches page that the user can use to delete
all the branches that are already merged. This can be used to clean up
all the branches that were forgotten to delete while merging MRs.
Fixes #21076.
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
