| Age | Commit message (Collapse) | Author |
|---|
|
fix: commit messages being double-escaped in activities tab
See merge request !6937
|
|
Grapify the commit status API
## What does this MR do?
Add the Grape-DSL to the commit status API.
## What are the relevant issue numbers?
Related to #22928
See merge request !6879
|
|
|
|
API: Fix Sytem hooks delete behavior
## What does this MR do?
This corrects the delete API for system hooks. Returning 200 is not the right way indicating a hooks is not found.
## What are the relevant issue numbers?
Discussed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6861/diffs#609af00c90e3d5241064d1404e3e018a3235634a_64_62
See merge request !6883
|
|
Delete dynamic environments
- Adds "close environment" action to a merge request
- Adds tabs to environments list
- Adds close button to each environment row in environments list
- Replaces Destroy button with Close button inside an environment
- Adds close button to builds list inside an environment
#### Configuration
In order to enable stopping environments a valid `.gitlab-ci.yml` syntax has to be used:
```
review:
environment:
name: review/$app
on_stop: stop_review
stop_review:
script: echo Delete My App
when: manual
environment:
name: review/$app
action: stop
```
This MR requires that `stop_review` has to have: `when`, `environment:name` and `environment:action` defined.
The next MR after this one will verify that and enforce that these settings are configured.
It will also implicitly configure these settings, making it possible to define it like this:
```
review:
environment:
name: review/$app
on_stop: stop_review
stop_review:
script: echo Delete My App
```
Closes #22191
See merge request !6669
|
|
'master'
Add Nofollow for uppercased external url protocols
Closes #22782
See merge request !6820
|
|
Add a new pipeline email service
## What does this MR do?
Add a new pipeline email service
## What are the relevant issue numbers?
Closes #3976
## Remaining tasks
* [x] Preserve `·` and ` `
* [x] Use XHTML 1.0
* [ ] Use the same layout (`app/views/layouts/notify.html.haml`)
* [ ] Digest or not (assets or public)
* [x] A similar email for succeeded pipeline
* [x] Plain text versions for both emails
## Screenshots (if relevant)
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6019#note_16594345
## 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] `PipelinesEmailService`
- [x] `SendPipelineNotificationService`
See merge request !6019
|
|
Use GrapeDSL for commits
See merge request !6914
|
|
|
|
Ensure that external URLs with non-lowercase protocols will be attributed
with 'nofollow noreferrer' and open up in a new window.
Covers the edge cases to skip:
- HTTPS schemes
- relative links
Closes #22782
|
|
|
|
|
|
Fix the diff in the merge request view when converting a symlink to a regular file
## What does this MR do?
It fixes a bug described in #21610
## Why was this MR needed?
There was a regression introduced in https://gitlab.com/gitlab-org/gitlab-ce/commit/cd7c2cb6ddd4d9c9f9bdae00c887c0022c121c17
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) 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?
Fixes #21610
See merge request !6828
|
|
|
|
* upstream/master: (58 commits)
Update endpoint to username validator
change border color to variable
Add todo for deprecated user routes and more information about deprecation to changelog
Provide better error message to the user
Apply better hierarchy to markdown headers and issue/mr titles
Swapped button text manipulation outcomes for the toggle query
Fixed find file keyboard navigation
Update CHANGELOG for 8.12.7
Added download-button class and applied button margin
Enable activerecord_sane_schema_dumper for test
Updated logo from @luke
Fix broken specs on MySQL after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6896
Fix Test Env (proper error handling when gitlab-shell is not clonned)
Fix randomly crashing spinach test for merge request
[Great spinach fix] Replace gsub with delete
Remove carriage returns from commit description as summary is on a newline and will always include carriage returns
Convert due_date_select.js filetype to es6.
Stop directly parsing due_date with Date.parse, prefer parsing implicitly.
Improve spec for pipeline metrics worker
Add Pipeline metrics worker
...
|
|
|
|
|
|
regular file.
In this specific case using file_path as a cache key is not enough,
because there are two entries with the same path.
Closes #21610.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* upstream/master: (148 commits)
Fix broken rspec in compare text
Added logic to handle a revision input that does not exist in the menu
Fix broken Spinach tests caused by changes in !6550
Convert CHANGELOG to Markdown
Fix active tab test for branches page
Fix merge requests feature tests
Wait for ajax call in merge request unsubscribe test
Fix 500 error when creating mileston from group page
Fix 404 when group path has dot in the name
Add the tech writers usernames in the doc_sytleguide doc
Fix broken SCSS linter errors due to missing newlines
Fix Hash syntax to work for both Ruby 2.1 and 2.3
Fix Spinach merge request diff failures
remove ashley since she no longer works here
Revert "Improve tabbing usability for sign in page"
Don't use member properties in users_spec, and remove loading ref.
Clean up stray Sign up ref.
Back off the array spreading, bc poltergeist freaks out.
Convert dispatcher to es6.
Add exists to users routes and fix endpoint.
...
|
|
|
|
* 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>
|
|
Using `extend self` prevents GitLab Performance Monitoring from being
able to track class methods.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23347
|
|
|
|
* upstream/master: (237 commits)
Grapify boards API
Add test, fix merge error
Use local assigns to get the dropdown title
Updated issuable dropdown titles
Added safety check for formatted values
Minor style improvement
Fixed conflict and corrected teaspoon test
Rename method in test
Moved ci_status environments logic to new action ci_envrionments_status and set up frontend polling
Refactor ci_status on MergeRequestController
Fix indenting error in HAML
Show what time ago a MR was deployed
Fixed missing links
Fixed missing links
Refactor merge requests revisions
Add link to update docs for source installations
Grapify todos API
Link to review apps example from docs
fix grafana_configuration.md move link
Do not run before_script, artifacts, cache in trigger_docs job
...
|
|
Grapify boards API
## What does this MR do?
Add the Grape-DSL to the boards API.
## What are the relevant issue numbers?
Related to #22928
See merge request !6876
|
|
Reassign secret token when regenerating one
## What does this MR do?
This is an attempt to fix intermittent errors in out test suite.
```text
Failures:
1) Gitlab::Shell memoized secret_token creates and links the secret token file
Failure/Error: expect(File.read(secret_file).chomp).to eq(secret_token)
expected: "690f959e206ab91acc54e1c605c7ff90"
got: "cccb4e8df9360600271e61114d4e6e68"
(compared using ==)
# ./spec/lib/gitlab/backend/shell_spec.rb:47:in `block (3 levels) in <top (required)>'
```
It appears that `spec/lib/gitlab/backend/shell_spec.rb` tries to change the file that stores secret token, but `Gitlab::Shell` memoizes `@secret_token` on class level, so when it was already created by other tests (`spec/requests/api/internal_spec.rb` in this case), memoized token is not reassigned even if it was generated again with `ensure_secret_token!`.
See merge request !6844
|
|
|
|
Grapify todos API
## What does this MR do?
Add the Grape-DSL to the todos API.
## What are the relevant issue numbers?
Related to #22928
See merge request !6875
|
|
Grapify system hooks API
## What does this MR do?
Add the Grape-DSL to the system-hook API.
## What are the relevant issue numbers?
Related to #22928
See merge request !6861
|
|
|
|
|
|
|
|
When reading conflicts:
1. Add a `type` field. `text` works as before, and has `sections`;
`text-editor` is a file with ambiguous conflict markers that can only
be resolved in an editor.
2. Add a `content_path` field pointing to a JSON representation of the
file's content for a single file.
3. Hitting `content_path` returns a similar datastructure to the `file`,
but without the `content_path` and `sections` fields, and with a
`content` field containing the full contents of the file (with
conflict markers).
When writing conflicts:
1. Instead of `sections` being at the top level, they are now in a
`files` array. This matches the read format better.
2. The `files` array contains file hashes, each of which must contain:
a. `new_path`
b. `old_path`
c. EITHER `sections` (which works as before) or `content` (with the
full content of the resolved file).
|
|
|
|
CE to EE merge check rake task
## What does this MR do?
This merge request adds a Rake task that checks whether the current branch can be merged cleanly to EE/master.
If not, it checks if a `<ce_branch>-ee` branch exists in EE, tries to merge it to EE/master and then tries to merge `ce_branch` to EE/master.
If the result of the check is that the current branch cannot be merged cleanly to EE/master, the job will fail, display troubleshooting steps, and a warning will be shown in the merge request.
## Are there points in the code the reviewer needs to double check?
Probably the steps I used to do the various checks, and also the steps I suggest to create an EE-specific branch.
## Why was this MR needed?
The goal is to catch as early as possible the possible conflicts a CE MR will cause when CE/master will be merged to EE/master. This way, the developer is warned that he/she should open a MR against EE before or as soon as the CE is merged. In the end, this should lower the work of the CE->EE merger.
## What are the relevant issue numbers?
Part of gitlab-org/gitlab-ee#715, hopefully.
See merge request !6746
|
|
Sort API mounts
## What does this MR do?
Sort the API mounts.
## Why was this MR needed?
The API mounts are unsorted.
See merge request !6831
|
|
Convert unicode emojis to images.
## Why was this MR needed?
For better cross platform interoperability with emojis.
Closes #22591
See merge request !6829
|
|
Also add a safeguard for non-CI env.
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Refactoring Issues Board
## What does this MR do?
This MR aims to minimize conflicts between the CE issues board feature with EE multiple boards feature.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
To avoid a lot of conflicts with EE multiple boards feature.
## 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)~~
- [x] 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)
- [ ] 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?
https://gitlab.com/gitlab-org/gitlab-ee/issues/929
https://gitlab.com/gitlab-org/gitlab-ee/issues/1084
See merge request !6727
|
|
GrapeDSL for variables
See merge request !6838
|
|
|
|
|
|
|
