Commit Graph
2141 Commits
Author SHA1 Message Date
Douglas Barbosa Alexandre 3d69d01e1f Cache results from jQuery selectors to retrieve namespace name 2016-07-01 16:43:11 -03:00
Douglas Barbosa Alexandre 8353cc6111 Fix import button when import fail due the namespace already been taken 2016-07-01 16:04:24 -03:00
Phil Hughes cc154fc47b Cache autocomplete results 2016-07-01 15:03:36 +01:00
Phil Hughes 805b9a8347 Updated breakpoint for sidebar pinning 2016-06-30 16:15:32 +01:00
Jacob Schatz 73196fbd65 Merge branch 'pin-nav-cookie-expiry' into 'master'
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
2016-06-30 14:39:07 +00:00
Dmitriy Zaporozhets 99e5ae10be Merge branch 'global-ajax-error-handler' into 'master'
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
2016-06-30 13:05:03 +00:00
Phil Hughes bf970141a1 Expiry date on pinned nav cookie 2016-06-30 11:58:34 +01:00
Fatih Acet b32a6add8f Merge branch 'fix_filebrowser_reload' into 'master'
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
2016-06-30 00:49:54 +00:00
Fatih Acet 48843c0d85 Merge branch '19157-use-shortcuts-is-not-working-on-gitlab-com-help' into '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
2016-06-30 00:09:05 +00:00
Jacob Schatz dbac53aa26 Merge branch 'left-align-flash-messages' into 'master'
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
2016-06-29 23:13:56 +00:00
Luke "Jared" Bennett 8cdee2bab2 Exposed 'onToggleHelp() to window object so showHelp() can be a global function'
Removed from window and used static method
2016-06-29 23:15:36 +01:00
Alfredo Sumaran 6a626a465c Fixes opening files on a new tab with meta key + click or using mouse middle button 2016-06-29 16:49:48 -05:00
Alfredo Sumaran 6c9f5a50e9 Skip element that is wrapped by a link
This fixes the double request being made to the same URL
2016-06-29 16:49:48 -05:00
Douwe Maan 1d34ce13fc Merge branch 'issue_3359_3' into 'master'
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
2016-06-29 19:23:03 +00:00
Jacob Schatz c051630aa8 Merge branch 'search-input-blur' into 'master'
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
2016-06-29 19:22:08 +00:00
Felipe Artur d2971315ab Merge branch 'master' into issue_3359_3 2016-06-29 11:32:38 -03:00
winniehell c8d66594e0 Align flash messages with left side of page content (!4959) 2016-06-29 16:22:41 +02:00
Felipe Artur 36d48120f6 merge master into issue_3359_3 2016-06-29 11:04:18 -03:00
Jacob Schatz bef4294c58 Merge branch 'filter-fade-fix' into 'master'
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
2016-06-29 12:49:19 +00:00
Jacob Schatz 9c2fbcb064 Merge branch 'md-toolbar-multiline-code' into 'master'
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
2016-06-29 05:17:39 +00:00
Jacob Schatz bcebdee751 Merge branch '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?

😕 

## 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
2016-06-28 20:02:52 +00:00
Annabel DunstoneandDmitriy Zaporozhets 706c5a1399 Switched mobile button icons to ellipsis and angle 2016-06-28 16:01:42 +02:00
Annabel DunstoneandPhil Hughes 2e1a70fefc Decreased window min width for pinned sidebar 2016-06-28 13:41:46 +01:00
Jacob Schatz e0e325625e Merge branch 'emoji-menu-stick-search' into 'master'
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
2016-06-27 18:03:08 +00:00
Phil Hughes 4e1b670f81 Removed fade when filtering results 2016-06-27 17:02:20 +01:00
winniehell 87fcb0abcb Fix check for existence of new branch button (!4630) 2016-06-27 17:59:50 +02:00
Phil Hughes 4678e22b5f Markdown toolbar inserts code blocks
Closes #19173
2016-06-27 16:12:03 +01:00
Jacob Schatz f0ed8930f7 Merge branch 'issue_15588' into 'master'
Fix issue being ordered twice and callback when moving between states

fixes #15588 

See merge request !4296
2016-06-24 21:09:33 +00:00
Jacob Schatz e45d6043e8 Merge branch 'js-content-for' into 'master'
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
2016-06-24 20:51:02 +00:00
Felipe Artur bade71ba5a Add specs and improve coffescript sortable binding function 2016-06-24 15:24:59 -03:00
Felipe Artur c391a72c18 Fix issue being ordered twice and callback when moving between states 2016-06-24 15:23:33 -03:00
Jacob Schatz 1f472c72bc Merge branch '18438-ios-scrolling' into 'master'
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
2016-06-23 22:21:21 +00:00
Jacob Schatz c390555f2f Merge branch '19008_ci_dropdown_label_fix' into 'master'
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
2016-06-23 21:46:50 +00:00
Jacob Schatz 0710560cf6 Merge branch 'fix-bulk-assign' into 'master'
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
2016-06-23 21:46:06 +00:00
Annabel DunstoneandJacob Schatz 350e57fd0e Move fade out divs outside of scrolling container on project view 2016-06-23 17:45:22 -04:00
Jacob Schatz d61c69f450 Merge branch '18536_status_dropdown_label' into 'master'
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
2016-06-23 21:42:04 +00:00
Jacob Schatz cf83213514 Merge branch 'ref-dropdown-jquery-objects' into 'master'
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
2016-06-23 21:40:51 +00:00
Alfredo Sumaran 0e3208c405 Use instance property to enable/disable label assignment 2016-06-23 16:13:42 -05:00
Alfredo Sumaran 3d5172b509 Disable Label update when no issues are selected 2016-06-23 16:13:42 -05:00
Alfredo Sumaran 618cf373ca Apply labels only if we picked a label from the dropdown 2016-06-23 16:13:42 -05:00
Alfredo Sumaran 61959480c2 Apply selected value as label 2016-06-23 12:13:09 -05:00
Connor Shea 4cca9a3e0f Reorganize the lib directory. 2016-06-23 10:55:40 -06:00
Connor Shea 7ce0968a52 Re-implement page-specific JS in a better way.
This makes larger libraries more cacheable and will allow us to use SRI with the dynamically included libraries.
2016-06-23 10:33:38 -06:00
Phil Hughes 92c71a426c Updated to add parentheses 2016-06-22 17:32:06 +01:00
Felipe Artur 2674b54860 merge master into issue_3359_3 2016-06-22 10:47:48 -03:00
Felipe Artur 8447c6b180 Insert notification settings dropdown into groups 2016-06-22 10:44:20 -03:00
Felipe Artur 92e183542f Insert notification settings dropdown into groups 2016-06-22 10:38:42 -03:00
Phil Hughes 363f7a5794 Empty the content before append anything to the dropdown 2016-06-22 08:59:03 +01:00
Phil Hughes 5a09745534 Use jQuery objects in ref dropdown 2016-06-22 08:43:54 +01:00
Luke "Jared" Bennett 0b33f90b8c forced filter input to process inputs after data has loaded 2016-06-22 02:41:38 +01:00