Commit Graph
2127 Commits
Author SHA1 Message Date
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
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
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
Annabel Dunstone 94ac45cf0e Hide nav arrows by default; remove settings dropdown btn at larger breakpoint; remove unneccessary CSS 2016-06-21 17:27:34 -05:00
Jacob Schatz 7198b78417 Merge branch 'contributors-graph-mobile' into 'master'
Apply responsive design for Contributors graphs.

## What does this MR do?

Makes the Contributors graphs work on mobile.

## Are there points in the code the reviewer needs to double check?

That this doesn't break on any screen sizes.

## Why was this MR needed?

It used to be squished and impossible to read.

## What are the relevant issue numbers?

Fixes #18845.

## Screenshots (if relevant)

Before:

![Screen_Shot_2016-06-18_at_1.00.58_PM](/uploads/bc17df5dabed0085c8ffdca303a502a5/Screen_Shot_2016-06-18_at_1.00.58_PM.png)

After:

![Screen_Shot_2016-06-20_at_9.21.03_AM](/uploads/a0307cb255646800d0e4c8647769f7b6/Screen_Shot_2016-06-20_at_9.21.03_AM.png)

cc: @jschatz1 

See merge request !4801
2016-06-21 20:29:50 +00:00
Jacob Schatz 4523da8fbf Merge branch 'selector-refactor' into 'master'
jQuery selector refactor in application.js.

Minor refactor for unnecessarily repeated `$(document)` `$(window)` and `$('body')`

See merge request !4809
2016-06-21 17:48:09 +00:00
Jacob Schatz 179783f1ce Merge branch 'notification-dropdown-active-fix' into 'master'
Fixed issue with notification dropdown not updating active

## What does this MR do?

This fixes an issue where the notification dropdown wouldn't correctly update the selected notification type in the dropdown. I've also added a spinner to show the action is happening & removed the flash message for success.

## What are the relevant issue numbers?

Closes #18480 

## Screenshots (if relevant)

![notifications](/uploads/5ed5055d180c12450cea77543ae5f44e/notifications.gif)

See merge request !4615
2016-06-21 15:31:39 +00:00
Jacob Schatz ac4529f700 Merge branch '18743-sidebar-pin-tooltip' into 'master'
Resolve "Tooltip for pinning sidebar"

## What does this MR do?
Adds tooltip to show whether sidebar is pinned/unpinned

## What are the relevant issue numbers?
Closes #18743 

## Screenshots (if relevant)
![Screen_Shot_2016-06-17_at_12.14.25_PM](/uploads/162f52084a770012cdc621122acd6c6c/Screen_Shot_2016-06-17_at_12.14.25_PM.png)
![Screen_Shot_2016-06-17_at_12.14.35_PM](/uploads/d9296720aeada972441f48d9a3d2f7f8/Screen_Shot_2016-06-17_at_12.14.35_PM.png)

See merge request !4759
2016-06-21 14:56:21 +00:00
Jacob Schatz 0d287b06a6 Merge branch '17521-gitlab-ci-yml-templates' into 'master'
GitLab CI Yaml template dropdown

## What does this MR do?
Make it possible to select a dropdown for an easy start with GitLab CI.

## What are the relevant issue numbers?
Closes #17521

## TODO
- [ ] Backend
  - [x] CHANGELOG item
  - [x] Fix rubocop failure
  - [x] API Support
  - [x] New tests
  - [x] Add disclaimer to the top of the gitlab-ci.yml
- [ ] Frontend
  - [x] New tests

See merge request !4411
2016-06-21 10:56:41 +00:00
Alfredo Sumaran 3beff9e4a1 Fix tooltip title and persist state 2016-06-21 04:59:43 -05:00
Annabel DunstoneandAlfredo Sumaran ef1e3d0df7 Add tooltip on pin/unpin nav 2016-06-21 04:59:15 -05:00
Phil Hughes a4d4a7e635 Fixed issue with notification dropdownn not updating active
Changes bell icon to spinner to show the action is happening
Removed the flash message

Closes #18480
2016-06-21 08:35:11 +01:00
Fatih Acet 3cf9b772d9 jQuery selector refactor in application.js. 2016-06-21 00:21:56 +03:00
Jacob Schatz fc63251fd5 Merge branch 'lbennett/gitlab-ce-18113-edit-note-shortcut-conflicting' into 'master'
Stop edit note up key shortcut conflicting with native shortcuts

## What does this MR do?

Restricts edit note shortcut to only the `up` button, if modifier keys are used it will not fire the shortcut.

## Are there points in the code the reviewer needs to double check?

Ney.

## Why was this MR needed?

UX

## What are the relevant issue numbers?

Closes #18113.

## 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 !4761
2016-06-20 20:21:05 +00:00
Z.J. van de WegandAlfredo Sumaran 483dc62eaa Incorporate review 2016-06-20 14:48:28 -05:00
Alfredo Sumaran 5d12189296 Add GitLab CI Yml dropdown selector 2016-06-20 14:48:28 -05:00