Commit Graph
2024 Commits
Author SHA1 Message Date
Fatih Acet fe125f8dc9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search-dropdown
# Conflicts:
#	app/assets/javascripts/lib/common_utils.js.coffee
2016-06-16 02:04:09 +03:00
Jacob Schatz 433e0a41cb Merge branch 'award-emoji-fix' into 'master'
Fix emoji block selector.

Fixes #18465 and #18577

See merge request !4604
2016-06-15 22:39:32 +00:00
Jacob Schatz 1a832c8f00 Merge branch 'network-assets' into 'master'
Replace raphael-rails with raphael.js and split it from the rest of the JS

## What does this MR do?

Removes raphael.js and its related libraries from the default JS bundle.

It also removes raphael-rails because the gem is unmaintained and – for whatever reason – didn't want to cooperate with the way I was trying to require it.

This brings the default (compressed and minified) application.js from 354KB after the d3 MR (!4394) down to 324KB.

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

That tests pass and that there aren't errors on any pages (especially the Network page).

## Why was this MR needed?

It's only used on the Network page and was using way too much bandwidth for just one page.

## What are the relevant issue numbers?

#14372 #13165 

Follow-up to !4394 and !4516.

cc: @jschatz1 

See merge request !4519
2016-06-15 21:11:31 +00:00
Jacob Schatz f0c58c72a9 Merge branch 'milestone-date-clear' into 'master'
Due date can be removed from milestones

## What does this MR do?

Adds a button to milestone form to allow user to remove due date 

## What are the relevant issue numbers?

Closes #15063 

## Screenshots (if relevant)

![Screen_Shot_2016-06-02_at_08.32.03](/uploads/8bd4446abde745dd5b1e140a887ec694/Screen_Shot_2016-06-02_at_08.32.03.png)

See merge request !4428
2016-06-15 20:52:09 +00:00
Jacob Schatz be37ff7acb Merge branch 'add-shortcut-to-copy-file-content-hash-link' into 'master'
Add shortcut to copy file content hash link

## What does this MR do?

* Allows for multiple shortcut handlers to be initialised
* Adds `y` shortcut to file pages to copy permalink URL.

## 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 #14470.

## Screenshots (if relevant)

![y-shortcut](/uploads/b81feb26d8e0d7d4996c4afa29f385d7/y-shortcut.gif)

See merge request !4496
2016-06-15 20:51:30 +00:00
Jacob Schatz 995a59314e Merge branch '17929-issue-shortcut-doesnt-work-on-some-pages' into 'master'
New issue shortcut doesnt work on some pages

## What does this MR do?

1. Slightly tidies dispatcher switch case by utilising 'fall through' cases.
2. Adds shortcuts to project pipelines, milestones, builds and forks pages

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

I have a feeling that these may have been missed out of the case statements on purpose?

## Why was this MR needed?

Possible UX issue highlighted in #17929.

## What are the relevant issue numbers?

Closes #17929.

Closes #12616. (dup)

Closes #18123. (dup)

Closes #13688. (dup)

## Screenshots (if relevant)

See merge request !4393
2016-06-15 20:30:40 +00:00
Jacob Schatz bb1c0e88ae Merge branch 'issuable-sidebar-bold' into 'master'
Fixed issue with bold in issuable sidebar

## What does this MR do?

~~The sidebar contained both normal font weight & bold font weight, so this standardises them to bold.~~

After looking at the designs, i've updated the font weights & colors throughout the sidebar to correctly match them

## Screenshots (if relevant)

![Screen_Shot_2016-06-02_at_11.03.40](/uploads/0a3eb6a67ce5722c77f6adf2fe883017/Screen_Shot_2016-06-02_at_11.03.40.png)


See merge request !4398
2016-06-15 20:29:50 +00:00
Jacob Schatz 5f22603b3f Merge branch 'issue_18575' into 'master'
Improve usability for prioritized labels

## What does this MR do?
- Adds an icon next to prioritized label rows serving as a hint to the user that the labels can be sorted by dragging them.
- Adds description about prioritized labels.
- Restores empty message when removing all prioritized labels.

## Screenshots (if relevant)

![labels](/uploads/1da16c4c54a894fa45ccc47e3a5bdf7a/labels.gif)

Closes #18575 

See merge request !4652
2016-06-15 19:50:02 +00:00
Jacob Schatz 64a09d6e02 Merge branch 'pinned-sidebar' into 'master'
Pinned sidebar navigation option

## What does this MR do?

Gives the ability to pin the sidebar navigation. Pinning is only possible on screens with above `lg` which is `1200px` if not it reverts to being hidden by default.

## What are the relevant issue numbers?

Closes #18542 

## Screenshots (if relevant)

### Un-pinned

![Screen_Shot_2016-06-15_at_17.29.08](/uploads/82b7495df6ea46a2334a7c25d03b019b/Screen_Shot_2016-06-15_at_17.29.08.png)

### Pinned

![Screen_Shot_2016-06-15_at_17.29.41](/uploads/3eb381be807985d0a9583f000cb802f9/Screen_Shot_2016-06-15_at_17.29.41.png)

See merge request !4683
2016-06-15 19:21:17 +00:00
Phil Hughes 7886692147 Moved pinned button to the bottom
Changed breakpoint width to 1440px
2016-06-15 19:35:37 +01:00
Phil Hughes 7d9157ff47 Clicking body closes nav
Fixed issue when nav wasn't present
2016-06-15 18:33:18 +01:00
Phil Hughes 9d74eb4622 Increased speed of sidebar transition 2016-06-15 18:14:20 +01:00
Phil Hughes e3529d5432 Pinned sidebar navigation option
Closes #18542
2016-06-15 17:23:49 +01:00
Fatih AcetandJacob Schatz 415b032ba1 Prevent default disabled buttons and links. 2016-06-15 11:37:45 -04:00
Alfredo Sumaran 0cb7d834f7 Add handler icon to prioritized labels 2016-06-15 10:35:58 -05:00
Jacob Schatz 93a496d270 Merge branch 'mr-buttons-update' into 'master'
Fixed issue with MR buttons being in a group

## What does this MR do?

Fixes design issue with the buttons in the merge request widget

## Screenshots (if relevant)

![Screen_Shot_2016-06-09_at_14.13.32](/uploads/44ac4175f5a97a8d7baf97be6eebc684/Screen_Shot_2016-06-09_at_14.13.32.png)


See merge request !4562
2016-06-15 15:23:02 +00:00
Jacob Schatz e27de52607 Merge branch 'issuable-sidebar-dropdown-deselect-fix' into 'master'
Fixed issue with de-selecting dropdown option in issue sidebar

## What does this MR do?

When de-selecting either an assignee or milestone, we try to send `undefined` which jQuery removes from the request causing a routing error. Instead this MR sends `null` which jQuery still sends and then correctly removes either the milestone or assignee. 

## What are the relevant issue numbers?

Closes #18641 

## Screenshots (if relevant)

![assignee](/uploads/6eaca416fb6e31eabf4c038967160c07/assignee.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
  - [ ] 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 !4671
2016-06-15 14:59:02 +00:00
Jacob Schatz d1f0ad45b0 Merge branch 'tooltip-change' into 'master'
Update project star/unstar tooltip

## What does this MR do?
Fixes project toggle star button tooltip to show actual tooltip for its state.

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

## Why was this MR needed?
- When you star a project tooltip wasn't changing.
- When you star a project and refresh the page, tooltip was still showing `Star Project`

## What are the relevant issue numbers?
Fixes #18143

## Screenshots (if relevant)

### Before 
![Screen_Shot_2016-06-15_at_15.31.57](/uploads/e005951c23eeed7c2761a0ec1911f3ce/Screen_Shot_2016-06-15_at_15.31.57.png)

### After
![tooltip-change](/uploads/4caec99eac6ffcc7331947fdfdb9e051/tooltip-change.gif)

## 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
  - [ ] 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 !4672
2016-06-15 14:55:00 +00:00
Fatih Acet 13b32e74bc Fix project star tooltip on the fly.
Introduced new util called updateTooltipTitle.
2016-06-15 15:14:53 +03:00
Phil Hughes 342434c886 Fixed issue with de-selecting dropdown option in issue sidebar
Closes #18641
2016-06-15 12:40:22 +01:00
Jacob Schatz bb7af46d32 Merge branch 'fix-header-logo-link' into 'master'
Fix the logo in header not being an anchor link.

## What does this MR do?

Adds an actual link to the Tanuki in the header instead of a `Turbolinks.visit()`.

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

Do we care that this reverts the Safari issue fixed in !2690? I feel bad, but it's hacky and there's not a great way to fix it here.

## Why was this MR needed?

You couldn't open the home page in a new tab before, it was very annoying.

## What are the relevant issue numbers?

Fixes #18604 

cc: @rspeicher 

See merge request !4661
2016-06-15 11:37:01 +00:00
Phil Hughes e412c1f25e Fixed issue with move dropdown not being searchable
Closes #18634
2016-06-15 08:53:11 +01:00
Jacob Schatz 27f75cf4a8 Merge branch 'rs-fix-note-polling' into 'master'
Fix note polling when a window has been hidden

`refresh` was called, `refreshing` was set to true, but then because
`document.hidden` was true, `getContent` was never called, and
`refreshing` never got reset to `false`, which stopped polling entirely
until refresh.

See merge request !4635
2016-06-14 22:03:58 +00:00
Stan Hu 5ac17fb2fa Merge branch 'manual-todos-issuable-sidebar' into 'master'
Manually create todo for issuable

## What does this MR do?

Adds a button to the sidebar in issues & merge requests to allow users to manually create a todo item themselves.

## What are the relevant issue numbers?

Closes #15045 

## Screenshots (if relevant)

![Screen_Shot_2016-06-07_at_09.52.14](/uploads/00af70244c0589d19f241c3e85f3d63d/Screen_Shot_2016-06-07_at_09.52.14.png)

![Screen_Shot_2016-06-07_at_09.52.06](/uploads/e232b02208613a4a50cff4d1e6f119ff/Screen_Shot_2016-06-07_at_09.52.06.png)

![Screen_Shot_2016-06-07_at_09.51.14](/uploads/f1d36435d49ab882538ae2252bec8086/Screen_Shot_2016-06-07_at_09.51.14.png)

See merge request !4502
2016-06-14 22:01:43 +00:00
Connor Shea b4f0dcc7df Fix #18604, logo in header wasn't an anchor link. 2016-06-14 15:57:46 -06:00
Alfredo Sumaran fef47d234a Use Turbolink instead of ajax 2016-06-14 12:39:51 -05:00
Alfredo Sumaran a0d58a83e0 Reinitialize checkboxes to toggle event bindings 2016-06-14 12:39:51 -05:00
Alfredo Sumaran 72d87d6c16 Turn off handlers before binding events 2016-06-14 12:39:51 -05:00
Jacob Schatz 400b415974 Merge branch 'nav-horizontal-alignment' into 'master'
Aligned the two navs horizontally

## What does this MR do?

Previously the 2 top navs were not aligned horizontally together. The top nav would be slightly to the left due to the settings dropdown. This corrects that by putting `position: absolute` on the dropdown toggle.

## What are the relevant issue numbers?

Closes #18513 

## Screenshots (if relevant)

![Screen_Shot_2016-06-13_at_10.20.22](/uploads/46f39a84dde74707578970f70ddda511/Screen_Shot_2016-06-13_at_10.20.22.png)

See merge request !4616
2016-06-14 17:37:42 +00:00
Phil Hughes 0b1eea8f97 Removed console.log
Uses outerWidth instead of width
2016-06-14 17:53:26 +01:00
Phil Hughes 330e913681 Uses update URL to update the status of a todo 2016-06-14 08:36:07 +01:00
Phil Hughes 20d382a891 Moved todo creation over to project todos controller 2016-06-14 08:36:07 +01:00
Phil Hughes f8a8999a20 Cached jQuery selectors 2016-06-14 08:36:07 +01:00
Phil Hughes 05525b5531 Fixed issue with todo button not updating state
This would happen when a todo already exists, the state of the button
wouldn't update after the ajax call
2016-06-14 08:36:07 +01:00
Phil Hughes f67b06ada0 Manually create todo for issuable
Added a button into the sidebar for issues & merge requests to allow users to manually create todo items

Closes #15045
2016-06-14 08:36:07 +01:00
Robert Speicher e20aa4581b Fix note polling when a window has been hidden
`refresh` was called, `refreshing` was set to true, but then because
`document.hidden` was true, `getContent` was never called, and
`refreshing` never got reset to `false`, which stopped polling entirely
until refresh.
2016-06-13 16:23:38 -04:00
Kamil Trzcinski 72f6f46e11 Merge remote-tracking branch 'origin/master' into artifacts-expire-date 2016-06-13 18:58:55 +02:00
Jacob Schatz 70672182d1 Merge branch 'fix-bulk-assign-labels' into 'master'
Fixes bulk-assign label for multiple issues not having the same labels

## What does this MR do?
Fixes a bug when bulk-assigning a label to multiple issues while the label is present in on the issues on the selection.

## Screenshots (if relevant)

**Before Bugfix**

<img src="/uploads/ad1f290bcf3930177a3a71c69cbe5325/before-bugfix.gif" width="700"/>

**After Bugfix**

<img src="/uploads/1f04d6bf027806fb13ca3773febda744/bugfix.gif" width="700"/>

## Does this MR meet the acceptance criteria?

- [x] Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)

See merge request !4602
2016-06-13 15:57:38 +00:00
Phil Hughes 29130f37ad Hides the fade right unless required 2016-06-13 15:58:09 +01:00
Fatih Acet 6f96d3ecf3 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search-dropdown 2016-06-13 17:06:15 +03:00
Phil Hughes 22e97dd702 Fixed issue with MR buttons being in a group
Also removed some inline code
2016-06-13 11:46:53 +01:00
Phil Hughes 93080b65cd Displays time remaining relative to now 2016-06-13 11:08:15 +01:00
Kamil TrzcinskiandPhil Hughes 304979f897 Allow to show the time in the future 2016-06-13 11:06:38 +01:00
Alfredo Sumaran 952660d2cf Fixes a bug when assigning a label to multiple issues
Fixes the case when we want to assign a label to multiple issues and one of the issues has already the label we want to apply.
2016-06-10 23:55:50 -05:00
Fatih Acet bcc3f8f237 Fix emoji block selector. 2016-06-11 00:24:24 +03:00
Annabel Dunstone 67a18f34e9 Fix safari logo loading animation safari bug 2016-06-10 12:01:51 -05:00
Annabel Dunstone cb126995aa Revert side nav to full width; remove border under nav; remove tooltips on nav links; stop page content shifting with side nav; put project nav in container 2016-06-10 12:01:51 -05:00
Annabel Dunstone ade0a4af8b Fix logo at all screen widths, update sidebar text 2016-06-10 12:01:51 -05:00
Annabel Dunstone a1fbdbb6b1 Move tanuki icon to center of nav bar; keep nav closed by default; remove collapsed nav cookie 2016-06-10 12:01:51 -05:00
Luke "Jared" BennettandLuke "Jared" Bennett 479ecbab9b Tidied dispatcher switch and added shortcuts to project pipelines, milestones and forks pages
Updated CHANGELOG

Moved CHANGELOG entry
2016-06-10 17:50:12 +01:00