| Age | Commit message (Collapse) | Author |
|---|
|
|
|
|
|
|
|
|
|
|
|
|
|
* master: (51 commits)
Fix spec/features/admin/admin_active_tab_spec.rb
Fix eslint errors
Don't open Asciidoc module twice
Add `gitlab_rails['auto_migrate'] = false` to HA docs for Redis/PG [ci skip]
Unify margin widths
Add $CI_ENVIRONMENT_NAME and $CI_ENVIRONMENT_SLUG
Add Okta authentication documentation
Create environments when the build referencing them is created
Add an environment slug
Make the index on environment name and project id unique, fixing up any duplicates
Rename `issue create` slash command to `issue new`
Add changelog for !7850.
Update Mattermost slash commands docs to explain how to create a newline and use <kbd> for user input. See HTML5 spec: https://www.w3.org/TR/html5/text-level-semantics.html#the-kbd-element
Improve `issue create …` slash command with user input keys to create a newline in chat clients.
Add explicit status test, feedback:
Don't call anything on a block, use simple if
Use described_class and update description
Also use latest_status, feedback:
Fixed bug with +1 not autocompleting
added changelog entry
...
|
|
24824 Add focus state to dropdowns
## What does this MR do?
Adds focus state to dropdown items to increase accessibility.
## Screenshots (if relevant)
## 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 #24824
See merge request !7885
|
|
# Conflicts:
# app/assets/stylesheets/pages/pipelines.scss
|
|
|
|
|
|
|
|
|
|
|
|
This ports some code over from EE to reduce conflicts
|
|
|
|
|
|
Signed-off-by: David Wagner <david@marvid.fr>
|
|
The chevron now has the same darker shade when the dropdown is opened it
had when hovered on.
Signed-off-by: David Wagner <david@marvid.fr>
|
|
Make sort and filter dropdowns look the same and tweak their icon and
colors according to #24150.
Signed-off-by: David Wagner <david@marvid.fr>
|
|
|
|
|
|
Enable PseudoElement in scss-lint
## What does this MR do?
Enables `PseudoElement` in `.scss-lint.yml`
## Are there points in the code the reviewer needs to double check?
None
## Why was this MR needed?
Improve SCSS maintainability and consistency
## Screenshots (if relevant)
None
## Does this MR meet the acceptance criteria?
- 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?
#23485
See merge request !7083
|
|
Resolve "Admin/Overview/Users mobile view"
## What does this MR do?
Fixes mobile layout issues on `/admin/users` page.
* Fixes control element placement when long usernames or email addresses overflow their container
* Fixes condensed dropdown menu (issue caused by acde2e30)
Before:
After:
## Are there points in the code the reviewer needs to double check?
Ensure css changes don't have any side effects elsewhere in GitLab. (I don't think they would...)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) 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?
Closes #22746
See merge request !7087
|
|
|
|
Enable SingleLinePerSelector in scss-lint
## What does this MR do?
Enables `SingleLinePerSelector` in `.scss-lint.yml`
## Are there points in the code the reviewer needs to double check?
This MR touches a lot of files, just need another pair of eyes to look through and make sure I didn't break anything.
## Why was this MR needed?
Improve SCSS maintainability and consistency
## Screenshots (if relevant)
None
## Does this MR meet the acceptance criteria?
- 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?
#23485
See merge request !7081
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
artifacts-from-ref-and-build-name
* upstream/master: (107 commits)
Fix external issue tracker "Issues" link leading to 404s
Fix CHANGELOG entries related to 8.11 release.
Fix changelog
Reduce contributions calendar data payload
Add lock_version to merge_requests table
Add hover color to emoji icon
Fix wrong Koding link
Capitalize mentioned issue timeline notes
Fix groups sort dropdown alignment
Use icon helper
Fix inline emoji text alignment
Adds response mime type to transaction metric action when it's not HTML
Moved two 8.11 changelog entries to 8.12
Fix markdown link in doc_styleguide.md
Display project icon from default branch
Reduce number of database queries on builds tab
Update CHANGELOG
Update Issue board documentation
Label list shows all issues (opened or closed) with that label
Update CHANGELOG
...
|
|
artifacts-from-ref-and-build-name
* upstream/master: (192 commits)
Added CHANGELOG
Added unfold test to parallel and added 'diff discussion' context
Fix Spinach branches spec
Better first match on this MR also
Change merge_error column from string to text type
Fix typo in gitlab_flow.md
entities: make Environment inherit EnvironmentBasic
Updated to optimized specs from !5864
Added 'with an unfolded line should not allow commenting' scenario (line 125)
Added addtional 'renderable' validator to check 'data-note-type' attr exists
Allow passing an index to selectRowAtIndex
Fixed enter key in search input not working
Fix file links on project page Files view
Fix incorrect "stopped impersonation" log message
8.11 is released, long live 8.12
Also check if Akismet is enabled, before showing the `Submit as spam` button.
fix location of markdown help location
Fix for update 8.10-to-8.11.md doc.
Appease the linter.
Add Ruby 2.3 upgrade notes.
...
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
Also resolve feedback.
|
|
artifacts-from-ref-and-build-name
* upstream/master: (109 commits)
Update CHANGELOG for 8.10.6, 8.9.7, and 8.8.8
Updated Akismet documentation
Add hover state to todos (!5361)
Load issues and merge requests templates from repository
Backport EE assertions in protected branch related specs.
Revert "Merge branch '19957-write-tests-for-adding-comments-for-different-line-types-in-diff' into 'master'"
Fix a missed `before_action` for `AutocompleteController`.
Backport `AutocompleteController#load_project` from EE!581.
Fix API::BranchesSpec.
Fix failing tests relating to backporting ee!581.
Revert unrelevant changes
Fix the protected branches factory.
Improve EE compatibility with protected branch access levels.
Move the "update" portion of the protected branch view into a partial.
Don't select an access level if already selected.
Backport changes from gitlab-org/gitlab-ee!581 to CE.
Further refactor and syntax fixes.
Upgrade httpclient gem from 2.7.0.1 to 2.8.2.
Make rubocop happy
Make rubocop happy
...
|
|
|
|
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
Also updates protect branch list
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
|
|
This reverts merge request !5290
|
|
This reverts merge request !4970
|
|
GL dropdowns in issuable form
## What does this MR do?
Changed all the issuable dropdown menus over to user GL dropdowns. This brings the dropdowns to be inline with the issuable filter dropdowns and allows for labels to be created whilst creating/editing an issuable.
## What are the relevant issue numbers?
Closes #12574
## Screenshots (if relevant)
See merge request !4970
|
|
Closes #19684
|
