| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6896
|
| |\
| |
| |
| |
| |
| |
| | |
Fix randomly crashing spinach test for merge request
For https://gitlab.com/gitlab-org/gitlab-ce/issues/23378
See merge request !6932
|
| | |
| |
| |
| | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
'master'
Fix atom feed spinach failure
## What does this MR do?
Replaces all carriage returns in the expected commit description.
Is a partial fix to...
> spinach 5 10 https://gitlab.com/gitlab-org/gitlab-ce/builds/5132637 - partial fix in !6910
As you can see, the other half of the fix to this build is in !6910.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
Failed spinach tests
## 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 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?
See merge request !6922
|
| | | | |
|
| | |/
| |
| |
| | |
and will always include carriage returns
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Add Pipeline metrics worker
## What does this MR do?
Creating a new Merge Request metrics is time consuming, because we need to access repository.
This makes this operation asynchronous, thus non-blocking for updating pipeline.
## Are there points in the code the reviewer needs to double check?
## 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 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?
See merge request !6896
|
| | | |
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | | |
Add RTL support to Markdown rendering
See merge request !6296
|
| | | | |
|
| |\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | | |
Fix trending projects Spinach failure
The trending projects list is now pre-calculated. To make this work with the Spinach test, we have to manually refresh the list.
Partial fix to #23378
See merge request !6911
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
The trending projects list is now pre-calculated. To make this work
with the Spinach test, we have to manually refresh the list.
Partial fix to #23378
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix broken rspec in compare text
!6910 changed the filter text from "Filter by branch/tag" to "Filter by Git revision"
See merge request !6926
|
| |/ / /
| | |
| | |
| | | |
!6910 changed the filter text from "Filter by branch/tag" to "Filter by Git revision"
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix broken Spinach tests caused by changes in !6550
!6550 added dropdowns for the branch "from" and "to" fields, but these Spinach tests were not updated accordingly.
Partial fix to #23378
See merge request !6910
|
| | | | | |
|
| |/ / /
| | |
| | |
| | | |
Partial fix to #23378
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix active tab test for branches page
For https://gitlab.com/gitlab-org/gitlab-ce/issues/23378
See merge request !6923
|
| | | | |
| | | |
| | | |
| | | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fix Spinach merge request diff failures
gitlab-git-test `master` was updated in ff076d88, and this caused the merge request diffs to change in a way that broke assumptions in the Spinach tests.
Partial fix to #23378
See merge request !6916
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
gitlab-git-test `master` was updated in ff076d88, and this caused
the merge request diffs to change in a way that broke assumptions in the
Spinach tests.
Partial fix to #23378
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Convert CHANGELOG to Markdown
All this does is convert the version sections into headers. The list
items shouldn't really be indented by two spaces, but it makes no
difference to the rendering and this way we retain authorship history
for the actual changes.
Related to https://gitlab.com/gitlab-org/release-tools/merge_requests/29
[ci skip]
See merge request !6925
|
| |/ / / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
All this does is convert the version sections into headers. The list
items shouldn't really be indented by two spaces, but it makes no
difference to the rendering and this way we retain authorship history
for the actual changes.
Related to https://gitlab.com/gitlab-org/release-tools/merge_requests/29
|
| |\ \ \ \ \
| |_|/ / /
|/| | | |
| | | | |
| | | | | |
Add the tech writers usernames in the doc_sytleguide doc
See merge request !6924
|
| | |\ \ \ \
| |/ / / /
|/| | | |
| | | | | |
# Conflicts:
# doc/development/doc_styleguide.md
|
| |\ \ \ \ \
| |_|_|_|/
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fix 500 error when creating mileston from group page
Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/23378
See merge request !6920
|
| |/ / / /
| | | |
| | | |
| | | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fix 404 when group path has dot in the name
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23401
See merge request !6919
|
| |/ / / /
| | | |
| | | |
| | | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Added book club to university
## What does this MR do?
Adds the old University Book Club to the new University content
## What are the relevant issue numbers?
Closes #23353
See merge request !6888
|
| | | | | | |
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Includes a note on valid paths for cache and artifacts in the
place users are most likely to learn about the feature.
## Why was this MR needed?
We get regular support requests relating to cache and artifacts
not being picked up outside the project root. It's intended
behaviour, and should be documented.
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/1792
See merge request !6892
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
See https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/1792
|
| |\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Fix Hash syntax to work for both Ruby 2.1 and 2.3
Ruby 2.1 specs were failing (e.g. https://gitlab.com/gitlab-org/gitlab-ce/builds/5149275) due the error:
```
SyntaxError: /builds/gitlab-org/gitlab-ce/app/views/devise/shared/_tabs_normal.html.haml:3: syntax error, unexpected ':', expecting =>
...'#login-pane', data: {'toggle':'tab'}, role: 'tab')).to_s));...
```
See merge request !6917
|
| | | |_|_|/ /
| |/| | | | |
|
| |\ \ \ \ \ \
| |/ / / / /
|/| | | | |
| | | | | |
| | | | | | |
Fix broken SCSS linter errors due to missing newlines
See merge request !6918
|
| |/ / / / / |
|
| |\ \ \ \ \ |
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Handle unmatched routing with not_found method
## What does this MR do?
Handle all unmatched routes with 404 method
## Why was this MR needed?
We need this to prevent routing error when user access URL like /123 when there is no resource located under such name.
## What are the relevant issue numbers?
Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/23378 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6733.
See merge request !6905
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This reverts commit 68ab7047dae98172a0bd8b92956f2ee51b9167a0.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
We need this to prevent routing error when user access URL like /123
when there is no resource located under such name
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Improve ExtractsPath logic related to atom format
* Fixes one test from https://gitlab.com/gitlab-org/gitlab-ce/issues/23378.
* Fixes issue introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6750.
See merge request !6907
|
| | | |/ / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* Don't set request format to atom if '.atom' suffix was not provided
* Don't try '.atom' detection logic on request that uses extended_sha1
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\ \ \ \ \ \ \
| |/ / / / / / |
|
| | |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
remove ashley since she no longer works here
## What does this MR do?
Merges gitlab-org/gitlab-ee!803 in the right place.
This was already merged in EE because I sent the MR there by accident.
See merge request !6913
|
| | | | | | | | | |
|
| | |\ \ \ \ \ \ \
| | |/ / / / / /
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Fix Spinach failure due overprecise percentage matching
The percentages in the language match changed by a tenth of a percentage point for Ruby and JavaScript, which led to this failure.
Partial fix to #23378
See merge request !6912
|
