Age | Commit message (Collapse) | Author |
|
Resolve "Display "folders" for environments"
## What does this MR do?
Adds the ability to show the grouped environments inside "folders".
Adds several reusable vue components in order to accomplish the recursive tree data structure presented.
For the individual components, Jasmine tests were added.
For the ones that depend of an API response, rspec tests are used.
## Screenshots (if relevant)
![Screen_Shot_2016-11-16_at_02.00.13](/uploads/1278012c8639b999b53f080728d283e1/Screen_Shot_2016-11-16_at_02.00.13.png)
![Screen_Shot_2016-11-16_at_02.00.25](/uploads/a3d65416ddb553e1b8f0f4c8897a75dc/Screen_Shot_2016-11-16_at_02.00.25.png)
![Screen_Shot_2016-10-17_at_16.08.50](/uploads/af63efe1d2cbd5fc069408622ef4b607/Screen_Shot_2016-10-17_at_16.08.50.png)
![environments](/uploads/b5a1801766d82ab176fc60f96b6968cb/environments.gif)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [ ] [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
- [ ] 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 #22539
See merge request !7015
|
|
|
|
|
|
Fix typo in Build page JavaScript
## What does this MR do?
fixes #24614
See merge request !7563
|
|
|
|
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:**
![merge-request-before](/uploads/91953598087a613078d80333a43815a7/merge-request-before.png)
**After**
![2016-11-15_17.41.46](/uploads/c809ba53cc34ee83bb439ed741dc39f3/2016-11-15_17.41.46.gif)
## 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
|
|
|
|
|
|
|
|
|
|
Pipelines page redesign
Closes #23637
![Screen_Shot_2016-11-15_at_1.36.34_PM](/uploads/edc6a58f00cca3e03ffd1689bd6eebd8/Screen_Shot_2016-11-15_at_1.36.34_PM.png)
See merge request !7487
|
|
|
|
Removes unneeded comparision
|
|
|
|
|
|
|
|
|
|
|
|
* 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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Highlight first user autocomplete option
See merge request !7520
|
|
Revert "Merge branch '22680-unlabel-limit-autocomplete-to-selected-items' into 'master'"
There were some issues with the initial implementation: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6796#note_18557076
This reverts https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6796
See merge request !7521
|
|
'master'
Adds hash anchors to diff_files to make possible linking exact file in commit
Closes #24010
See merge request !7298
|
|
|
|
into 'master'"
This reverts merge request !6796
|
|
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
|
|
explicitly disable eslint inline
## What does this MR do?
Explicitly disables eslint inline.
I.E. `/* eslint-disable */` => `/* eslint-disable max-len, no-new, ... */`
I used the script from https://gitlab.com/lbennett/eslint-dsblr.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
It will help refactor out eslint issues for older files.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) 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
- [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?
See merge request !7229
|
|
|
|
|
|
|
|
|
|
Opening the user dropdown currently sends 2 requests. This has been changed so only one is sent
Closes #24131
|