| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
Revert "Merge branch '22680-unlabel-limit-autocomplete-to-selected-items' into 'master'"
There were some issues with the initial implementation: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6796#note_18557076
This reverts https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6796
See merge request !7521
|
| | |
| |
| |
| |
| | |
into 'master'"
This reverts merge request !6796
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| | |
'master'
Adds hash anchors to diff_files to make possible linking exact file in commit
Closes #24010
See merge request !7298
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Right now, the following naming scheme for diff files is used: diff-1, diff-2, ... and also we have "internal" format which is file-path-HASH, where HASH is sha1 of file path.
Besides, we have HASH_lineA_lineB format to link exact line number in MR diff. It makes sence to unify the way we link diff from outside, while leave "file-path-HASH" format for internal (js) usage.
Changes in this commit allow to link diff just by HASH, if we don't want specify exact lines, also it changes "file-path-HASH" and "diff-NUMBER" links in code to this unified format.
Inspired by #24010 and !7298
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Defer saving project services to the database if there are no user changes
## What does this MR do?
It defers saving project services to the database as long as it is possible. It creates a project service when creating a project only if this project service has an active template. After that project services are saved on the first edit.
## Are there points in the code the reviewer needs to double check?
- tests that used `build_missing_services` before the change
- number of queries executed
## Why was this MR needed?
Motivation in #22281
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 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 #22281
See merge request !6958
|
| | | | |
|
| | | | |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
| |\ \ \ \
| |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Move the `objects` method to `LfsHelper` so that it is also available to `LfsStorageController`
## What does this MR do?
Move the `objects` method to `LfsHelper` so that it is also available to `LfsStorageController`
It is needed for the `lfs_check_access!` callback when the repository size limit is enabled (EE only).
cc @stanhu @ahanselka
## Why was this MR needed?
Errors shown here: gitlab-org/gitlab-ce#24392
Discovered thanks to gitlab-com/infrastructure#302
## What are the relevant issue numbers?
Fixes #24392
Fixes gitlab-com/support-forum#1280
See merge request !7417
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
`LfsStorageController`
It is needed for the `lfs_check_access!` callback when the repository size limit is enabled (EE only).
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | | | |
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Ensure labels are loaded for all "show" methods of MR Controller
Closes #24397
See merge request !7416
|
| | | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | | |
Previously, they were only being loaded on the actual `show` action, but
not the actions representing the tabs (commits, builds, etc).
|
| |\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | | |
| | | | |
| | | | |
| | | | | |
them to be configurable
|
| | | |/ /
| |/| | |
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fix the collapsed diff when converting a symlink to a regular file
#21610
!6828
See merge request !6953
|
| | | |/ /
| |/| |
| | | |
| | | |
| | | | |
In this case comparing old_path and new_path is not enough because there
are two entires that match.
|
| | |/ /
|/| | |
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
'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
|
| | |/ |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Restore unauthenticated access to public container registries
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24284
See merge request !2025
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Respect project visibility settings in the contributions calendar
This MR fixes a number of bugs relating to access controls and date selection of events for the contributions calendar
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23403
See merge request !2019
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Ensure external users are not able to clone disabled repositories.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23788
See merge request !2017
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| |\ \
| | |
| | |
| | |
| | | |
Apply `*_params_ce` pattern to ProjectsController
See merge request !7338
|
| | | | |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix broken commits search
## What does this MR do?
Fixes commits search
## What are the relevant issue numbers?
Closes #24255
See merge request !7339
|
| | |/ / |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | | |
Use separate email-friendly token for incoming email
See merge request !5914
|
| | | | |
| | | |
| | | |
| | | | |
reactivates all tests and writes more tests for it
|
| | | |/
| |/|
| | |
| | | |
email token be reset
|
| |\ \ \
| | | |
| | | |
| | | |
| | | | |
Fix project index page
See merge request !7331
|
| | | |/
| |/|
| | |
| | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into 'master'
Network page appear with an error message when entering nonexistent git revision
Closes #2362
See merge request !7172
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | |/ |
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| | |
Use more than one kind of Git garbage collection
Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6588 by @jacobvosmaer to get the builds to pass :)
Closes #22729
See merge request !7321
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Show pipeline status from branch and commit than only commit
Closes #23615
See merge request !7034
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* upstream/master: (35 commits)
Only skip group when it's actually a group in the "Share with group" select
Fix: Todos Filter Shows All Users
Fix: Guest sees some repository details and gets 404
Move shared params to a helper
GrapeDSL for project hooks
Update commits.scss
updated styling commit SHA on branches page + added to changelog
change build list height to show 6,5 builds + improve padding of list, with first/last child selectors
Ignore builds directory from eslint
Add changelog entry
Document multiple repository storage paths
Allow multiple repository storage shards to be enabled, and automatically round-robin between them
Cleaned up global namespace JS
Add tip for using Chrome to run and debug teaspoon tests.
Add CHANGELOG entry file
Add jquery.timeago.js to application.js
Update match-regex to fix filename convention
Move jquery.timeago to vendor directory
Change a bunch of doc links to either relative or https://docs.gitlab.com.
Show log corresponding to env in admin/logs
...
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* upstream/master: (126 commits)
Allow to search for user by secondary email address in the admin interface
Rename :name search parameter to :search_query at /admin/users
Fix project features default values
Add a link to the Issue Boards API in main README
Fix Markdown styling inside reference links
Fix relative links in Markdown wiki when displayed in "Project" tab
Flexbox webkit prefixes
Tests update
Tests update
Changed where merge request link is
New todos blank state
Implement CreateMembers service to make controller thin
Do not show tooltip for active element (!7105)
Update CHANGELOG
Assign local_assigns[:subject] to a variable on the shared label partial
Use select instead of pluck on Project.group_ids
Skip authorization check when searching for labels on IssuableFinder
Use label subject to calculate number of issues/mrs within the group
Remove unnecessary includes(:priorities) on Projects::LabelsController
Add 8.13.2 CHANGELOG entries
...
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* upstream/master: (65 commits)
Fixed typo in css class
Merge branch 'airat/gitlab-ce-23268-fix-milestones-filtering' into 'master'
Escape quotes in gl_dropdown values to prevent exceptions
Fixes various errors when adding deploy keys caused by not exiting the control flow.
Fix typo on /help/ui to Alerts section
Grapify tags API
Add 8.13.1 CHANGELOG entries
Fix sidekiq stats in admin area
Remove use of wait_for_ajax since jQuery was removed
Specify which Fog storage drivers are imported by default in backup_restore.md
Moved avatar infront of labels
Don't schedule ProjectCacheWorker unless needed
Fixed height of sidebar causing scrolling issues
Reduce overhead of LabelFinder by avoiding #presence call
Fixed users profile link in sidebar Fixed new labels not being created
Improve redis config tasks for migration paths job
Ensure search val is defined.
Ensure cursor is applied to end of issues search input.
Increase debounce wait on issues search execution.
Keep the new resque.yml aside and use it once we've checked out master
...
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* upstream/master: (67 commits)
Stop unauthized users dragging on issue boards
Capitalize Git
Add docker-compose environment initialization command
Improve readability and add specs for label filtering
Improve label filtering implementation
Allow the use of params[:name] when filtering labels
Fix Rubocop offenses in issue move specs
Add spec in Issues::MoveService to fix label assignment regression
Fix bug where labels would be assigned to issues that were moved
Fix `User#to_reference`
Fix rubocop build error
Remove redundant class_name and foreign_key overrides
Enable SingleLinePerSelector in scss-lint
Escape ref and path for relative links (!6050)
Add failing test for #21420
Enable SpaceAfterVariableColon in scss-lint
Enable SpaceAroundOperator in scss-lint
Enable trailingWhitespace in scss-lint
Disable Rails/Output cop since it makes no sense here
Use File.write instead of File.open + File#write
...
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Closes #23615
|
