Age | Commit message (Collapse) | Author |
|
into 'master'
Hacked in a better message for attachment network error
## What does this MR do?
Adds a better error message for when a user is uploading an attachment and they cannot reach the GitLab instance.
Now displays `Network error. Please check your connection.`.
## Are there points in the code the reviewer needs to double check?
As noted above, I think this is hacky, ideally this would be sent straight from the backend but if not then this should be handled globally?
/cc @fatihacet
## Why was this MR needed?
Attachment upload UX
## What are the relevant issue numbers?
Closes #19161.
## Screenshots (if relevant)
*UPDATED:*
![Screen_Shot_2016-06-30_at_00.42.37](/uploads/b3b4044782dd4c4c17735e99acc45502/Screen_Shot_2016-06-30_at_00.42.37.png)
## 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 [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)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !4977
|
|
Naive attempt at fixing Underscore templates
## What does this MR do?
Attempts to fix part of #18939.
## Are there points in the code the reviewer needs to double check?
That this doesn't break anything.
## Why was this MR needed?
See #18939.
## What are the relevant issue numbers?
#18939
## Does this MR meet the acceptance criteria?
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
See merge request !4842
|
|
|
|
|
|
|
|
|
|
|
|
Expiry date on pinned nav cookie
## What does this MR do?
Adds an expiry date far into the future for the pinned nav cookie so that it survives logout & browser closing.
See merge request !5009
|
|
Changed message to 'attaching the file failed' for all attachment errors
|
|
Global Ajax error handler
## What does this MR do?
Introduces a new global Ajax error handler to show a flash warning about the error detail of XHR requests which failed with status code 404 and 500
## Are there points in the code the reviewer needs to double check?
Double check the wording.
## Why was this MR needed?
A global solution for the problem in the #17880
## What are the relevant issue numbers?
Fixes #17880
## Screenshots (if relevant)
For requests failed with 404 - 500
![Screen_Shot_2016-06-21_at_00.07.26](/uploads/04bb3a5a958c3d21aef4fd12bd3d105a/Screen_Shot_2016-06-21_at_00.07.26.png)
For requests failed with 401
![Screen_Shot_2016-06-21_at_00.08.30](/uploads/25cc885ba388f4c6f4c555fa338e1a63/Screen_Shot_2016-06-21_at_00.08.30.png)
See merge request !4797
|
|
|
|
File Browser navigation fixes
Fixes a double request being made when clicking the file name when navigating through file browser and also fixes opening a file in a new tab or when doing ctrl + click.
Closes #19050
**Before**
![navigation-old](/uploads/f9a40c91e430e31beae3a896cffb1c68/navigation-old.gif)
**After**
![navigation](/uploads/dec9b43894c00cc09d80d19c83506530/navigation.gif)
See merge request !4891
|
|
'master'
Fixed 'use shortcuts' button on docs
## What does this MR do?
Exposes 'onToggleHelp() to window object through `showHelp()` so a help panel can be toggled globally using `showHelp()`.
## Are there points in the code the reviewer needs to double check?
Is this the best implementation? I actually think this is tidier than doing something like `onclick="new Shortcuts().onToggleHelp"` or `$.trigger 'keydown', char: '?'` but let me know.
## Why was this MR needed?
Docs UX
## What are the relevant issue numbers?
Closes #19157.
## 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
- [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)
Closes #19157
See merge request !4979
|
|
Align flash messages with left side of page content
## What does this MR do?
- align flash messages with left side of page content
## Are there points in the code the reviewer needs to double check?
- flash messages in general
## Why was this MR needed?
- flash messages didn't fit new design
## What are the relevant issue numbers?
closes #18688
## Screenshots
# Before
![failed-login](/uploads/fb57d288fb7ae775cc0b8dbb0c7b6af2/failed-login.png)
---
![explore-blocked-account](/uploads/aa6d5ff74a4c9ed29ed361f2ffdf5c8e/explore-blocked-account.png)
---
![project-blocked-account](/uploads/4f36118f5438d661ea202b180bf9cb8d/project-blocked-account.png)
---
![issue-blocked-account](/uploads/68e87385ec30952797dc5c1f8f36216d/issue-blocked-account.png)
---
![inline-flash](/uploads/c0aba047f90d56001265e37ba9751e19/inline-flash.png)
---
# After
![failed-login](/uploads/d45d2d832a16af8e1854f1832e7b87a4/failed-login.png)
---
![blocked-account](/uploads/ddcd3d23569ded403700c01934df61df/blocked-account.png)
---
![project-blocked-account](/uploads/9e286c3b95f70cae1819930a09cc1307/project-blocked-account.png)
---
![issue-blocked-account](/uploads/4fde8e770eab0dae03b25e1402f171a1/issue-blocked-account.png)
---
The left padding will be fixed by !4854
![inline-flash](/uploads/081b824b99d8ca65d67e9d15778a991d/inline-flash.png)
---
![flash-dismissed](/uploads/641e6227050de22e0df9a85ffca4ced1/flash-dismissed.png)
See merge request !4959
|
|
Removed from window and used static method
|
|
|
|
button
|
|
This fixes the double request being made to the same URL
|
|
Insert notification settings dropdown into groups
## Display notification settings dropdown for groups
part of #3359
![groups](/uploads/d61648236b81b0cca55fa2d73758f0df/groups.png)
![Screenshot_from_2016-06-29_10-58-37](/uploads/7be05ea6002932c094a81b25a308fd62/Screenshot_from_2016-06-29_10-58-37.png)
![small](/uploads/6f2b556d734c870e358f6f56618a0bab/small.png)
See merge request !4857
|
|
Fixed search field blur not removing focus
## What does this MR do?
Adds a blur event to remove focus styling from the search input.
Any particular reason we were looking for clicks on the document? I can't see why we would be.
## What are the relevant issue numbers?
Closes #18670
## Screenshots (if relevant)
![tab](/uploads/4c74d4f76ec7b45bfcf581606d2defb5/tab.gif)
See merge request !4704
|
|
|
|
|
|
|
|
Removed fade when filtering results
## What does this MR do?
Removes the `opacity` change when filtering results seeing as we now do `Turbolinks.visit` it isn't required.
Best way to see issue - filter issues & then go back. Will still have opacity styling.
See merge request !4932
|
|
Markdown toolbar inserts code blocks
## What does this MR do?
Adds the ability to insert code blocks with the markdown toolbar buttons. This is done by selecting the block & then clicking the code button.
## What are the relevant issue numbers?
Closes #19173
See merge request !4950
|
|
'18942-dropdowns-should-apply-any-present-filter-once-data-is-loaded' into 'master'
Fixed dropdown not filtering queries entered before data is loaded
## What does this MR do?
Triggers a 'keyup' event on a filters input to force it to process any text that was added before the data was retrieved and rendered.
## Are there points in the code the reviewer needs to double check?
:confused:
## Why was this MR needed?
UX
## What are the relevant issue numbers?
Closes #18942.
## 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
- [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)
See merge request !4846
|
|
|
|
|
|
Made the search bar on emoji menu sticky
## What does this MR do?
When scrolling down the emoji menu, the search bar disappears. For better UX, the search bar no stays at the top when scrolling.
## Screenshots (if relevant)
![emoji-sticky](/uploads/a5b4773547d3d67342ddcfc07c8f1568/emoji-sticky.gif)
See merge request !4743
|
|
|
|
|
|
Closes #19173
|
|
Fix issue being ordered twice and callback when moving between states
fixes #15588
See merge request !4296
|
|
Re-implement page-specific JS in a better way.
## What does this MR do?
This rebuilds the way we do page-specific JavaScript assets for a few reasons:
- The current implementation does not work with Subresource Integrity (!4808)
- The current implementation doesn't allow caching of libraries because each page we hook up with this system will have a separate application.js. Meaning that for every page that uses Ace Editor, we'd have to load Ace Editor plus any GitLab-specific scripts in the same file, making local caching of just Ace Editor impossible.
- The current implementation is rather hacky.
## Are there points in the code the reviewer needs to double check?
That Sprockets doesn't choke on this when we use precompiled assets.
## What are the relevant issue numbers?
#14372
## 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)
- [x] API support 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 you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
cc: @jschatz1 @pavelloz
Thanks to @pavelloz for his example implementation which was very useful.
See merge request !4883
|
|
|
|
|
|
Resolve "Scrolling horz on iOS for the secondary nav is broken"
## What does this MR do?
Moves absolutely positioned `div`s outside of the scrolling container because mobile safari causes those elements to jump around on scroll.
## Are there points in the code the reviewer needs to double check?
Check on a real iPhone (was only able to check in iOS simulator)
## Why was this MR needed?
Mobile Safari.
## What are the relevant issue numbers?
Closes #18438
## Screenshots (if relevant)
![mobile-safari-fix](/uploads/b38bba735530eb11507fe03036292dd8/mobile-safari-fix.gif)
See merge request !4869
|
|
Apply selected value as label
## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## What are the relevant issue numbers?
## Screenshots (if relevant)
![dropdown-label](/uploads/db2ea7cb3cc51fbdeea53c304f1bd7a5/dropdown-label.gif)
## 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
- [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 you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !4886
|
|
Fix unwanted label unassignment
## What does this MR do?
- When updating the milestone
- [x] Do not remove labels when assigning a milestone
- [x] Do not remove labels when unassigning a milestone
- [x] Do not remove labels when assigning a milestone and adding another label
- When toggling selected issues labels should be kept
- [x] Select an issue with an assigned label -> pick another label from dropdown-> unselect the issue -> select the issue again -> submit the form: Existing label should not be removed.
## Are there points in the code the reviewer needs to double check?
Labels should not be added or removed to issues when doing bulk actions unless we explicitly select a label from the dropdown
## 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] 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 you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !4863
|
|
|
|
Set button label when picking an option from status dropdown
## What does this MR do?
Fixes an issue with the status dropdown. It was not setting up the correct label after picking an option
## What are the relevant issue numbers?
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18536
## Screenshots (if relevant)
**Previous**
![status-select-previous](/uploads/7c6adbd6c5ba2660dc39a762d53d3b68/status-select-previous.gif)
**After**
![status-select](/uploads/91483efed8fbd63a79a01c9ca2154b74/status-select.gif)
## 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
- [x] All builds are passing
- [ ] 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)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !4771
|
|
Use jQuery objects in ref dropdown
## What does this MR do?
Keeps the behaviour the same as the ref dropdown, however it now uses jQuery objects to handle the HTML creation instead of passing strings around. It pretty much worked out the box so not much was changed in the dropdowns themselves. Will be easy to transfer this over to other dropdown menus as well.
cc. @jschatz1 @rspeicher @DouweM
Do we want this to go into a patch release?
See merge request !4850
|
|
|
|
|
|
|
|
|
|
|
|
This makes larger libraries more cacheable and will allow us to use SRI with the dynamically included libraries.
|
|
|
|
|