| Age | Commit message (Collapse) | Author |
|---|
|
|
|
Move admin abuse report spinach test to RSpec
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
See merge request !7691
|
|
Simplify copy on "Create a new list" dropdown in Issue Boards
## What does this MR do?
It changes the "Create new list" text to simply "Add list". It also describes the operation in a more concise way. It was suggested in #24659.
## Are there points in the code the reviewer needs to double check?
Although I refactored references to the name of the button to reflect the new text, I left part of the documentation unmodified:
File: `doc/user/project/issue_board.md`
```
In short, here's a list of actions you can take in an Issue Board:
- [Create a new list](#creating-a-new-list).
- [Delete an existing list](#deleting-a-list).
```
because I was not sure if changing those was necessary.
Additionally, I replaced every occurrence of `click_button 'Create new list'` with `click_button 'Add list'`in the spec. I'm not sure if that causes any change in behavior as I am not sure if there are any hooks to the previous name, explicitly.
File: `spec/features/boards/boards_spec.rb`
## Why was this MR needed?
It is an improvement, as suggested in #24659
## Screenshots (if relevant)
**Before:**
**After:**
## Does this MR meet the acceptance criteria?
- [X] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [X] [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
- [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?
#24659
See merge request !7605
|
|
Move abuse report spinach test to RSpec
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
See merge request !7659
|
|
|
|
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
|
|
part of https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
|
|
|
|
Fix deselecting calendar days on contribution graph
## What does this MR do?
Fix deselecting calendar days on contribution graph
## Are there points in the code the reviewer needs to double check?
Shouldn't be
## Why was this MR needed?
In `master`, you can currently deselect a calendar day after selecting but you cannot reselect that day.
## Screenshots (if relevant)
Before:
After:
## 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 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 #22381
See merge request !6453
|
|
Disabled award emoji button when user is not logged in
## What does this MR do?
The award emoji buttons are now disabled when the user is not signed in, stopping them from clicking it & then getting an error.
## Screenshots (if relevant)
## What are the relevant issue numbers?
Closes #24680
See merge request !7651
|
|
Fix exceptions when loading build trace
## What does this MR do?
This MR fixes exceptions when loading build trace.
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [x] Tests added for this feature/bug
## What are the relevant issue numbers?
Closes #24638
See merge request !7658
|
|
Add help section for MM commands
## What should this MR do
Check @pedroms' design for the Mattermost service screen: https://gitlab.com/gitlab-org/gitlab-ce/issues/22540
Now this has to be implemented, I've created a clean canvas for you, @lbennett, to draw on.
## 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
- [x] All builds are passing
- [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)
See merge request !7558
|
|
|
|
See #24638
|
|
|
|
|
|
Closes #24680
|
|
'master'
Issues empty state
## What does this MR do?
Adds the empty state for the project, dashboard and group issues.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
### Filtered to show no issues (on group issues page in this case but also dashboard and projects)
### Project with no issues
### Group with no projects with any issues
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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?
Closes #20840
Closes #20850
See merge request !7309
|
|
Fix errors happening when source branch of merge request is removed and then restored
See merge request !7568
|
|
nothing to merge in merge request page
|
|
Also added tests, and moved the slack test to a better location.
|
|
Also allow merge request to be merged with skipped pipeline and the
"only allow merge when pipeline is green" feature enabled
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
Fixes regression causing an error message to appear when user first enters the Merge Request form.
Closes #24627
See merge request !7599
|
|
Merge request !7163 caused an error message to appear on the Merge
Request form when it was first loaded by the user. This commit fixes
that regression bug.
|
|
22539-display-folders
|
|
|
|
Less intrusive system note
## What does this MR do?
This MR is for making system notes less intrusive by implementing proposed design
## Are there points in the code the reviewer needs to double check?
System notes are reusing in issues, commits and MR discussions. May need to double check to make sure that the design is not breaking anywhere
## Why was this MR needed?
This merge request solve issue #19797
## Screenshots (if relevant)
**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)
- [ ] 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 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?
#19797, #23129
See merge request !6755
|
|
'jacopo-beschi/gitlab-ce-19981-admin-links-new-group-default-visibility' into 'master'
Fix Admin Links to new Group does not respect Default Visibility
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19981
See merge request !7560
|
|
Pipelines page redesign
Closes #23637
See merge request !7487
|
|
Settings
This is done by passing a visibility_level option to the group edit _form.
The visibility_level is set to @group.visibility_level in edit ation and
to default_group_visibility in the new action.
|
|
Allow registering users where the username contains dots (.)
## What does this MR do?
- Allow registering users whose usernames contains dots `.`
- This can currently be done by registering with a username containing no dots, and then editing the username to have dots in the user's profile settings.
## Does this MR meet the acceptance criteria?
- [#24276/!7500] Unable to register names with dot
- [x] Implementation
- [x] Tests
- [x] Added
- [x] [Passing](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7500/builds)
- [x] Meta
- [x] CHANGELOG entry created
- [x] Documentation created/updated
- [x] API support added
- [x] Branch has no merge conflicts with `master`
- [x] Squashed related commits together
- [x] Review
- [x] Endboss
- [x] Use `Gitlab::Regex::NAMESPACE_REGEX_STR` instead of a hardcoded pattern
- [x] Define `NAMESPACE_REGEX_STR` in terms of `NAMESPACE_REGEX_STR_JS`
- [ ] Wait for merge
## What are the relevant issue numbers?
- Closes #24276
See merge request !7500
|
|
Javascript does not support the negative lookbehind assertion (?<!) used
in the Ruby regex (to disallow usernames ending in `.git` or `.atom`.
Getting the client side code to fully support this format is
non-trivial, since we'd either have to heavily complicate the
regex used, or modify the frontend code to support more complex
validation schemes (it currently uses HTML5 validations).
The pragmatic choice is to create a
`Gitlab::Regex::NAMESPACE_REGEX_STR_SIMPLE` regex to serve as a
Javascript-compatible version of `NAMESPACE_REGEX_STR`.
The client-side code will not display an error for usernames ending in
`.git` and `.atom`, but these will be caught by the server-side
validation.
|
|
Added new spec step
Added empty state to dashboard
Split empty and filtered empty states
Moved empty_state icons into their own folder and DRY up empty state html
Fixed failing spec
Added to groups page
Review changes
|
|
|
|
* master: (26 commits)
Remove extra subscribable_type filter on migration
Add feature spec for labels subscription
Avoid code duplication for label subscription status on label partial
Rename LabelSubscription javascript to ProjectLabelSubscription
Fix label subscription menu on small screens resolution
Allow users to subscribe to a group label at group or project level
Use button instead of an icon to subscribe/unsubscribe to labels
Add CHANGELOG entry
Add toggle_subscription action to Groups::LabelsController
Allow subscriptions to be created without a project
Use subqueries instead of joins to migrate subscriptions
Add helper method to toggle label subscription on labels controller spec
Remove default value for `project` argument on subscribable concern
Use @project as default on ToggleSubscriptionAction concern
Allow users to subscribe to group labels at project-level
Pass project to Entities::Label to check if user is subscribed
Fix specs to pass a project when creating subscriptions
Refactoring label subscription toggle button text to accept a project
Refactoring label subscription status to accept a project
Refactoring notification service to find subscriptions per project
...
|
|
* master: (154 commits)
Fix typos
Fix wrong changelog item
Add missing item for 8.13.6
Change last_used_at to use touch
Add chat_name partial
Mention Git strategy none
Fix code review
adds fix for security issue when annonymous user does not ...
Remove ToC since it's now supported in the docs portal itself
Add 8.14 to versions with further additions to review apps
Add Limitations sections to environments and review apps docs
Add link to environments docs
Fix URL to review apps docs
Add a prerequisites section, add some links
Link to NGINX example project for the time being
Get rid most of the irrelevant sections
Add note about current limitation in $CI_BUILD_REF_NAME
Add an intro and an Overview section for Review Apps
WIP review apps
Add Review apps link to CI README
...
Conflicts:
spec/features/environments_spec.rb
|
|
Support subscribing to group labels
https://gitlab.com/gitlab-org/gitlab-ce/issues/23586
See merge request !7215
|
|
Allows to authorize chat user against GitLab.
This is needed for: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7438
See merge request !7450
|
|
Include author in assignee dropdown search
## What does this MR do?
Previously when you searched for the author in the assignee dropdown (if they aren't in the project) it did not actually include the author. This changes that so that when you search for the author it will correctly include the user.
## Screenshots (if relevant)
## What are the relevant issue numbers?
Closes #22905
See merge request !7526
|
|
|
|
|
|
|
|
|
|
When searching for the author in the assignee dropdown it now correctly returns the user
Closes #22905
|
|
Stop environment when branch is deleted
## What does this MR do?
This MR adds a environment teardown service, that is called when user deletes a branch. This most often happens when merge requests is merged.
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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
## What are the relevant issue numbers?
Closes #23218
See merge request !7355
|
|
adds dicussion icon and color change in system note links
adds discussion icons and sticky note icon for other system notes for now
fixes scss lint error
adds faded commit lists
hides first paragraph in commit list box
css tweak for commit list system notes
adds commit-list toggle functionality, css tweaks and css classnames more readable
small css fix in header. makes links bold in system note
renames class no-shade to hide-shade
adds entry for this merge request in changelog
removes commented line
removes the avatar-icon from discussion header
minor css tweaks to make the commit list alignment with header text
uses monospaced font to make the commit list lined up with all
removes icon from system note and align bullet list
resolves scss lint warings
adds helper function to extract system note message from first p tag
adds helper functions to check commit list count and haml cleanup
adds changelog entry under 8.14
adds changelog entry with changelog cli
removes helper and regex and makes commit list li count using JS
makes link in system note normal
brakeman build failure resolved
fixing rspec test based on new design for discussion
shows system note in lowercase
removes extra spaces from comments
adds code commenting for functions
adds semi-colon in some lines
fixes rspec given when merge build success
removes commented codes
rewrite changelog yml file
moves isMetaKey to common utils file
fixes some indentation issues
removes unnecessary variables and resolves some discussions
replaces jQuery parent function with siblings
fixes scss issues and variable spelling mistake
uses constant rather using hardcoded number for visible li count in long commit list
makes system note header all lowercase
uses color variables and adjust gradient a little
some minor changes for adding css classes
renames functions name for readability
changes changelog title
minor scss newline changes
makes system note less intrusive to a conversation
|
|
|
|
|
|
|
