| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fix pipeline error when trying to read empty merge request diff
When a user pushed something which resulted an empty merge request diff, `st_commits` would be `nil`. Therefore we also need to check if there exists `st_commits`.
We could tell this from:
``` ruby
def commits
@commits ||= load_commits(st_commits || [])
end
```
and
``` ruby
def save_commits
new_attributes = {}
commits = compare.commits
if commits.present?
commits = Commit.decorate(commits, merge_request.source_project).reverse
new_attributes[:st_commits] = dump_commits(commits)
end
update_columns_serialized(new_attributes)
end
```
Closes #22438
See merge request !6470
|
| | |
| |
| |
| | |
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6470#note_15856755
|
| | | |
|
| | |
| |
| |
| | |
Closes #22438
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fixups for Frontend for Merge Request Diff
## What does this MR do?
Makes a few revisions to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6343, as per feedback from @DouweM. Specifically, it removes a duplicate in the changelog, removes colons in dropdowns, uses icon helper, and fixes the 'Show original' link path.
## Why was this MR needed?
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6343 was already merged and this is a needed patch.
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6343
See merge request !6448
|
| | | | |
|
| | | |
| | |
| | |
| | | |
(Also removes duplicate changelog entry.)
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Update merge request versions documentation with new screenshots
For #13570 based on https://gitlab.com/gitlab-org/gitlab-ce/issues/21427
See merge request !6454
|
| | | | |
| | | |
| | | |
| | | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
'22421-fix-issuable-counter-when-more-than-one-label-is-selected' into 'master'
Hotfix the issuable counters when filtering by multiple labels
This is an ugly fix, but it make the counters work when multiple labels are selected so I think we should include it in 8.12, and try to find a proper fix afterward.
Closes #22421
See merge request !6455
|
| | | |/ /
| |/| |
| | | |
| | | | |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Update db/schema.rb per most recent migrations
See merge request !6446
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
It seems this wasn't updated properly when migrations were added in a
previous commit.
|
| |\ \ \ \ \
| |_|/ / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Bump gitlab-shell upgrade version to 3.6.0 for 8.12
[ci skip]
Closes #22442
See merge request !6469
|
| |/ / / /
| | | |
| | | |
| | | | |
[ci skip]
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fix typos in cycle analytics docs
See merge request !6467
|
| | | |/ /
| |/| |
| | | |
| | | | |
[ci skip]
|
| |\ \ \ \
| |_|_|/
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Change location and refactor issue closing pattern documentation
## Moving docs to a new location?
See the guidelines: http://docs.gitlab.com/ce/development/doc_styleguide.html#changing-document-location
- [x] Make sure the old link is not removed and has its contents replaced with a link to the new location.
- [x] Make sure internal links pointing to the document in question are not broken.
- [x] Search and replace any links referring to old docs in GitLab Rails app, specifically under the `app/views/` directory.
- [x] If working on CE, submit an MR to EE with the changes as well.
See merge request !6466
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Split into user and administrator docs:
- administration/issue_closing_pattern.md
- user/project/issues/automatic_issue_closing.md
[ci skip]
|
| | | |
| | |
| | | |
This reverts merge request !6429
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Reorganize sections in Admin area settings
## What does this MR do?
Some settings were under the "wrong" category. This is an attempt to provide proper categories and move relevant settings there.
## What are the relevant issue numbers?
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20126
See merge request !5449
|
| | |/ /
| | |
| | |
| | |
| | |
| | | |
- Create new 'Abuse reports' group
- Create new 'Usage statistics' group
- Create new 'Email' group
|
| | |/
|/| |
|
| |\ \
| | |
| | |
| | |
| | | |
Add default values for ProjectFeature
See merge request !6447
|
| | | | |
|
| | |/
| |
| |
| | |
Closes gitlab-org/gitlab-ce#22330
|
| |\ \ |
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix Import/Export security specs
Related https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1987#note_83855
See merge request !1997
|
| | | | | |
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Revert "Merge branch 'rs-update-rubocop-rspec' into 'master'"
Reverts https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6357
due to rubocop-rspec dropping support for Ruby 2.1.
See https://github.com/backus/rubocop-rspec/pull/131
See merge request !6444
|
| | |/ / /
| | | |
| | | |
| | | |
| | | | |
This reverts commit 70faf5fdfbfa0e427b12d4181a9302394974c3cf, reversing
changes made to 2307eb84dcd1748cc231719017551111310d1bf9.
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
And Snippets get awards
## What does this MR do?
Makes snippets more awesome, by making them awardables
## Why was this MR needed?
Because Snippets were left behind.
## What are the relevant issue numbers?
Closes #17878
See merge request !4456
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Also incorporate feedback
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
[ci skip]
|
| | | | | | |
|
| | | | | | |
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
'master'
Changed `Commit` to `Build` header on builds table
## What does this MR do?
As [discussed here](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6322#note_15511777) the pipeline table `Commit` headers should be `Pipeline`. This also should apply to build table headers.
## Are there points in the code the reviewer needs to double check?
/cc @tauriedavis
## Why was this MR needed?
UI consistency
## 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?
See merge request !6402
|
| | | | | | | |
|
| |\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Simplify ProjectTeam#fetch_members to satisfy flog
## What does this MR do?
- Add specs for ProjectTeam#fetch_members
- Simplify ProjectTeam#fetch_members to satisfy flog
## What are the relevant issue numbers?
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22200
See merge request !6431
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
We were calling `.where` and `.send` on the relation, but never doing
anything with the return value, resulting in proper access-level
filtering never being of any consequence.
|
| | | | | | | | |
|
| | | | | | | | |
|
