Commit Graph
5138 Commits
Author SHA1 Message Date
Jacob Schatz c66a7b0e94 Merge branch 'build-auto-refresh' into 'master'
Fixed issue with build auto-refresh not working

## What does this MR do?

Due to the `.json` at the end of the build URL fetch, the page wont correctly auto-reload the build log. This fixes that.

See merge request !5110
2016-07-06 21:04:27 +00:00
Jacob Schatz df174fa2d1 Merge branch '18858-options-dropdown-on-mobile-should-be-full-width' into 'master'
Added 100% width to open dropdown menus on mobile

## What does this MR do?

Sets dropdown-menus to be 100% width on small screens.

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

Do we want this on all dropdown menus or only dropdown menus activated by full-width buttons?
/cc @dzaporozhets 

## Why was this MR needed?

Mobile UX.

## What are the relevant issue numbers?

Closes #18858.

## Screenshots (if relevant)

![Screen_Shot_2016-06-22_at_00.14.09](/uploads/bd61721896bfac8af951374c2547acd6/Screen_Shot_2016-06-22_at_00.14.09.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
- [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 !4844
2016-07-06 21:01:07 +00:00
Jacob Schatz 96684317aa Merge branch 'escape-to-cancel-note' into 'master'
Cancel creating or editing note by hitting Escape

/cc @rspeicher 

See merge request !5075
2016-07-06 16:31:26 +00:00
Phil Hughes 2044af6ced Fixed issue with build auto-refresh not working 2016-07-06 10:16:16 +01:00
Douglas Barbosa Alexandre e89a515ce9 Fix unescaped strings in the labels dropdown template 2016-07-06 04:40:02 -03:00
Douglas Barbosa Alexandre e87ed41876 Render label name contains ?, & in the labels dropdown without escaping 2016-07-05 20:59:33 -03:00
Douglas Barbosa Alexandre ab811b6ab9 Render references for labels that name contains ?, or & 2016-07-05 20:57:09 -03:00
Douglas Barbosa Alexandre e186626d25 Allow '?', or '&' for label titles 2016-07-05 20:57:09 -03:00
Patricio Cano 2e96fcff12 Clone button should not be clickable when there is a disabled protocol 2016-07-05 16:54:22 -05:00
Patricio Cano 82652013f2 Fix CSS 2016-07-05 16:54:22 -05:00
Patricio Cano 512adc21fe Add setting that allows admins to choose which Git access protocols are enabled 2016-07-05 16:54:22 -05:00
Fatih Acet 6d12878d5a Merge branch '19161-non-helpful-flash-message-when-attaching-file-fails' 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
2016-07-05 21:51:00 +00:00
Douwe Maan 09c85ccb6e Use switch/when statement 2016-07-05 17:50:47 -04:00
Jacob Schatz 025be2f8b7 Merge branch 'underscore-templates' into 'master'
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
2016-07-05 21:44:34 +00:00
Jacob Schatz 4dda6def95 Merge branch 'ff-markdown-buttons-fix' into 'master'
Fixed markdown buttons in FF

## What does this MR do?

The markdown buttons weren't working with the `execCommand` function. So it has to fallback to replacing the value in the textarea.

See merge request !5085
2016-07-05 20:42:03 +00:00
Robert Speicher aefb8a1741 Merge branch 'update-gemoji' into 'master'
Add lib/gitlab/emoji.rb instead of gitlab_emoji gem and upgrade Gemojione

- No reason to split it into a separate gem when the gem barely did anything. We can use gemojione directly, making updating gemojione that much easier. Unless there's a particularly good reason we were using the gem?
- Fixes the Rake task since it broke after all the AwardEmoji changes.
- Update gemojione to 2.6.1.

Spring Update changes! http://emojione.com/releases/#2.2.0

See merge request !4919
2016-07-05 17:08:35 +00:00
Dmitriy Zaporozhets fe9246bf68 Merge branch 'project-header' into 'master'
Updated project header

## What does this MR do?

Updates the project header.

## What are the relevant issue numbers?

Closes #18544, #18832 

## Screenshots (if relevant)

![Screen_Shot_2016-06-29_at_14.16.16](/uploads/4df895e7ecf42e5ddab3f2f1e47f8c7e/Screen_Shot_2016-06-29_at_14.16.16.png)


See merge request !4989
2016-07-05 16:27:16 +00:00
Jacob Schatz 670073765a Merge branch 'new-mr-commit-alignment' into 'master'
Fixed avatar alignment in new MR view

## What does this MR do?

Fixes the alignment of the avatar in the new MR compare view

## Screenshots (if relevant)

![Screen_Shot_2016-07-05_at_16.17.54](/uploads/9c427f66f8ef1d5ecee627e57ee61322/Screen_Shot_2016-07-05_at_16.17.54.png)

See merge request !5095
2016-07-05 15:45:51 +00:00
Phil Hughes 0db54b1587 Fixed avatar alignment in new MR view 2016-07-05 16:16:49 +01:00
Dmitriy Zaporozhets 7facedfb19 Fix profile test to click on header user profile link
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-07-05 16:17:05 +03:00
Dmitriy Zaporozhets bca47688d4 Remove current user link to the profile from sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-07-05 16:17:05 +03:00
Phil Hughes bf5d28ea8d Fixed markdown buttons in FF 2016-07-05 11:54:49 +01:00
Phil Hughes e3390901a3 Chnaged padding of project header nav 2016-07-05 09:19:01 +01:00
Dmitriy Zaporozhets c6bfad2a67 Merge branch 'user-avatar-header' into 'master'
Added user avatar to header

## What does this MR do?

Adds  the users avatar to the header with a dropdown for profile & sign out.

## What are the relevant issue numbers?

Closes #18543 

## Screenshots (if relevant)

![Screen_Shot_2016-06-27_at_12.47.34](/uploads/852d0eb7075eefcf21f5cf5ff71a389a/Screen_Shot_2016-06-27_at_12.47.34.png)

![Screen_Shot_2016-06-27_at_12.47.36](/uploads/6cb29843d3a12bbf2d3ed2a7c9bde770/Screen_Shot_2016-06-27_at_12.47.36.png)

See merge request !4939
2016-07-04 18:51:12 +00:00
Douwe Maan 0deec938ce Double to single quotes 2016-07-04 13:58:05 -04:00
Douwe Maan 7e1c91e0d6 Add confirmation when canceling creating/editing with changes 2016-07-04 13:54:58 -04:00
Douwe Maan 88889d164d Cancel creating or editing note by hitting Escape 2016-07-04 13:42:42 -04:00
Phil Hughes 111fecc639 Reverted project avatar radius
Fixed spacing in missing links
2016-07-04 16:34:53 +01:00
Phil Hughes 211246c691 Mobile spacing 2016-07-04 16:34:53 +01:00
Phil Hughes 16ca8ec57f Updated spacing
CHANGELOG item
2016-07-04 16:34:53 +01:00
Phil Hughes eac81b988e Updated project header
Closes #18544
2016-07-04 16:34:53 +01:00
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
Jacob Schatz 6c0d3b4cf3 Merge branch 'cache-autocomplete-results' into 'master'
Cache autocomplete results

## What does this MR do?

Caches the results of the autocomplete AJAX call to stop new GFM inputs on the page from requesting new data. The cache is then cleared on each new page so that it doesn't stay around per project.

See merge request !5043
2016-07-01 14:41:52 +00:00
Phil Hughes cc154fc47b Cache autocomplete results 2016-07-01 15:03:36 +01:00
Rémy Coutable 8625bd3622 Improve the request / withdraw access button
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-01 12:48:54 +02: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
Luke "Jared" Bennett b4676c3337 _Hacked_ in a better error message
Changed message to 'attaching the file failed' for all attachment errors
2016-06-30 14:49:56 +01: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
Connor Shea 491c213af6 Fix unescaped strings in Underscore templates. 2016-06-29 15:59:30 -06: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
Jacob Schatz 47648a50d7 Merge branch 'button-focus-style' into 'master'
Adds focus state style to markdown area buttons.

## What does this MR do?

It makes it possible to see when the button is focused when tabbing through the interface. This is for the new markdown buttons in the comment field.

See merge request !4867
2016-06-29 21:34:18 +00:00
Fatih Acet 8cada02d49 Merge branch 'commit-avatar-alignment' into 'master'
Fixed comit avatar alignment

## What does this MR do?

Fixes the alignment of the avatar on https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG

Also fixes potential issues in other places.

## Screenshots (if relevant)

![Screen_Shot_2016-06-27_at_10.58.26](/uploads/fa4f50cfc30a870422d1afa63a4331d1/Screen_Shot_2016-06-27_at_10.58.26.png)![Screen_Shot_2016-06-27_at_10.58.35](/uploads/bd7dc3cf77464c1775fabb45b8079f02/Screen_Shot_2016-06-27_at_10.58.35.png)

See merge request !4933
2016-06-29 21:26:09 +00:00