| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |
|
|
| |
[ci skip]
|
| |\
| |
| |
| |
| | |
Mark inline difference between old and new paths when a file is renamed
See merge request !2652
|
| | | |
|
| |\ \ |
|
| | | | |
|
| | |/ |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Warn admin of granting admin rights during OAuth
Fixes #3951
Warning style the same as the warning a user sees on a archived project.
See merge request !2601
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Fixes #3951
Warning style the same as the warning a user sees on a archived project.
|
| | |/
|/| |
|
| | |
| |
| |
| |
| | |
This partially reverts 6a5cd3ca - we keep the migration and add a new
migration that reverts it in order to keep migration history intact.
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Correctly determine MR diff base when MR has merge conflicts
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12779
See merge request !2632
|
| | |\ \ |
|
| | | | | |
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Fix highlighting in blame view.
See merge request !2630
|
| | | | | | |
|
| | |\ \ \ \
| | | |/ /
| | |/| | |
|
| | | |/ /
| |/| | |
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
'master'
Fix preventing migration from crashing in very specific cases
Closes #12606. Closes #12501.
/cc @yorickpeterse @dbalexandre
See merge request !2600
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When using ActiveRecord::Base.connection.active? without a DB
connection, we get a "PG::ConnectionBad: could not connect to server"
error because ActiveRecord::Base.connection doesn't exist. By using
ActiveRecord::Base.connected? we ensure we don't get this error if
the connection is missing, which is the all point of the
Gitlab::CurrentSettings#connect_to_db? method!
|
| | |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* Follow REST for merge request API route
* Remove repeating comments API for MR
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | | | |
| | | |
| | | |
| | | | |
[ci skip]
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Skip the 2FA requirement during logout
See merge request !2581
|
| | | | | |
| | | | |
| | | | |
| | | | | |
[ci skip]
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Increase contrast between highlighted code comments and inline diff marker.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12737.
It was especially bad in Monokai, better now.
See merge request !2629
|
| | | |_|/ /
| |/| | | |
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Fix CI runner version not being properly updated when asked for a build
Due to broken implementation of attribute_for_keys the runner information was not updated correctly.
This MR adds test to check that such scenario will never happen again.
See merge request !2618
|
| | |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Due to broken implementation of attribute_for_keys the runner information was not updated correctly.
This MR adds test to check that such scenario will never happen again.
|
| |\ \ \ \ \
| |/ / / /
| | | | |
| | | | | |
fix/unexistent-group-500
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Use generic method to checks if artifacts are available
Closes #12626
See merge request !2576
|
| | | | | | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
[ci skip]
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The pattern in the `::reference_pattern` class method in the
ExternalIssue model does not match all valid forms of JIRA project
names. I have updated the regex to match JIRA project names with numbers
and underscores. More information on valid JIRA project names can be
found here:
https://confluence.atlassian.com/jira/changing-the-project-key-format-192534.html
* The first character must be a letter,
* All letters used in the project key must be from the Modern Roman Alphabet and upper case, and
* Only letters, numbers or the underscore character can be used.
|
| | | |_|_|/
| |/| | |
| | | | |
| | | | | |
This has been fixed in Workhorse [ci skip]
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Introduced by me through !2005
|
| | |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Track project import failure
Fixes #12512
This also help us on identify why the import process is returning the wrong status when the project was successfully imported. Like mentioned in the issue #12450
See merge request !2538
|
| | | | |/
| | |/| |
|
| |/ / / |
|
| |/ /
| |
| |
| | |
[ci skip]
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| | |
Don't vendor minified JS
Fixes #4031
See merge request !2494
|
| | | |
|
| | |
| |
| |
| | |
Closes #12517
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Ignore binary files in code search to prevent Error 500
Leaving out the -I option in "git grep" would cause an Error 500 because the
resulting line would include "Binary file X matches", which would cause the project search results to crash with the following error:
```
ActionView::Template::Error (wrong argument type nil (expected Regexp)):
1: - blob = @project.repository.parse_search_result(blob)
2: .blob-result
3: .file-holder
4: .file-title
app/models/repository.rb:742:in `sub'
app/models/repository.rb:742:in `block in parse_search_result_from_grep'
app/models/repository.rb:741:in `each_line'
app/models/repository.rb:741:in `parse_search_result_from_grep'
app/models/repository.rb:682:in `parse_search_result'
app/views/search/results/_blob.html.haml:1:in `_app_views_search_results__blob_html_haml__1959871337755590783_162450160'
app/views/search/_results.html.haml:20:in `_app_views_search__results_html_haml__2198486911700532411_58329920'
app/views/search/show.html.haml:7:in `_app_views_search_show_html_haml___1698304427272645201_62235300'
```
See merge request !2565
|
| | | |
| | |
| | |
| | |
| | | |
Leaving out the -I option in "git grep" would cause an Error 500 because the
resulting line would include "Binary file X matches"
|
| | | |
| | |
| | |
| | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\ \ \
| |/ /
|/| | |
|
| | |\ \
| | | |
| | | |
| | | | |
fix-comment-on-diff-ajax-loading
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This commits also fixes two minor issues:
- Ensure notes that the current user is not allowed to see are not
returned in the AJAX notes loading
- Ensure the notes counter badge is decremented of 1 instead of 2
|
| | | | |
| | | |
| | | |
| | | | |
[ci skip]
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Added cache:key to .gitlab-ci.yml allowing to fine tune the caching
The `cache:key` allows you to define the affinity mask of caching, allowing to have single cache for all jobs, or cache per-job, or per-branch, or any other way you would need:
1. Cache per-build for all branches:
```
cache:
key: "$CI_BUILD_NAME"
untracked: true
```
2. Cache per-branch for all jobs:
```
cache:
key: "$CI_BUILD_REF"
untracked: true
```
/cc @DouweM @grzesiek @axil
See merge request !2436
|
