Commit Graph
7012 Commits
Author SHA1 Message Date
Robert Speicher 9e2032173c Merge branch 'efficient-emoji-loading' into 'master'
Only load emoji spritesheet when necessary

On a normal issue where the only award emoji displayed by default are
the thumbs-up and thumbs-down emoji, this decreases the page load by
670KB or 250KB depending on pixel density.

Resolves #14334.

See merge request !3449
2016-04-09 00:17:12 +00:00
connorshea 3a196317ab Add "sprite" parameter to emoji_icon helper
The emoji_icon helper used to display the award emoji in Issue and
Merge Request views. By default the spritesheet is used, but passing
`sprite: false` to the `emoji_icon` helper makes the emoji render as
separate images.

For award emoji displayed by default (e.g. thumbs-up, thumbs-down, and
any that have been awarded to the issue/MR) the independent images are
used. Only when the full emoji menu is opened does the full spritesheet
load.

On a normal issue this change decreases the page load by 670KB or 250KB
depending on pixel density.

Resolves #14334.
2016-04-08 17:38:31 -06:00
connorshea 6a0f839941 Add a missing Oxford comma in some text on the Activity graph.
Resolves #14668. [ci skip]
2016-04-08 13:32:17 -06:00
Jacob Schatz f2b7cd4435 Revert "Merge branch 'new-navigation-prototype' into 'master'"
This reverts merge request !3494
2016-04-07 21:20:16 +00:00
Jacob Schatz f79d3cda35 Merge branch 'fix-number-of-todos-sidebar-is-not-updated' into 'master'
Update number of Todos in the sidebar when it's marked as "Done"

Closes #15002 

See merge request !3600
2016-04-07 17:44:41 +00:00
Douglas Barbosa Alexandre bb5bc90ab0 Update number of Todos in the sidebar when it's marked as "Done" 2016-04-07 12:35:25 -03:00
Rémy Coutable 074c239390 Merge branch 'issue_14012' into 'master'
Fix problem when creating milestones in groups without projects

Fixes #14012 

See merge request !3481
2016-04-07 15:19:56 +00:00
Rémy Coutable e8e9471c61 Merge branch 'dont-assign-me-if-you-arent-allow' into 'master'
Hide "assign to me" link if not allowed

Fixes #14996

See merge request !3590
2016-04-07 14:02:30 +00:00
Jacob Schatz d76a769d24 Remove duplication. Remove JS data attributes 2016-04-07 08:32:37 -04:00
Jacob Schatz 92649ca97a Hide "assign to me" link if not allowed 2016-04-07 07:09:31 -04:00
Rémy Coutable 8eae7b1088 Merge branch 'feature/expose-builds-badge' into 'master'
Expose badges

This MR exposes badge somewhere in visible place.

![expose_badges](/uploads/d2e290d3013d1ef2b1bdeebbbe2c5d8b/expose_badges.png)

Closes #13801

See merge request !3326
2016-04-07 08:40:15 +00:00
Jacob Schatz b471c76bcb Reset MR opts 2016-04-06 21:46:12 -04:00
Robert Speicher 730625f022 Merge branch 'patch/fix-markdown-preview-wikis' into 'master'
Wiki preview URL converting problem [via Markdown]

Current implementation when rendering the preview, thinks relative links are for project repository files.

We are creating a new preview route that will define correct context data to render for wikis instead.

Fixes #2380, #1184

See merge request !3461
2016-04-07 00:17:21 +00:00
Alfredo Sumaran bfcee4a51d Merge branch 'master' into issue_14952 2016-04-06 16:35:04 -05:00
Alfredo Sumaran 946b4519c9 Use .new_record? instead 2016-04-06 16:31:34 -05:00
Jacob Schatz b6d5fcd477 Merge branch 'issue_14800' into 'master'
Search Design fixes

Closes #14800 

- Use colors according to design
- Fix width of search input


![Screen_Shot_2016-04-05_at_11.12.33_AM](/uploads/83681ccd90a1a1542c056fd6dbc974d0/Screen_Shot_2016-04-05_at_11.12.33_AM.png)

![Screen_Shot_2016-04-05_at_11.11.54_AM](/uploads/f7557bea2ae055f3550b89751fd7d371/Screen_Shot_2016-04-05_at_11.11.54_AM.png)

See merge request !3475
2016-04-06 21:26:56 +00:00
Alfredo Sumaran ee87d15cf4 Change approach, do not use timeouts 2016-04-06 13:23:18 -05:00
Grzegorz Bizon 5f32b82a80 Change name of badge variable in badges controller 2016-04-06 19:56:34 +02:00
Grzegorz Bizon 15ea971847 Remove obsolete badge code from project view 2016-04-06 19:56:34 +02:00
Grzegorz Bizon a3a93ba4b0 Expose project badges in project settings menu 2016-04-06 19:56:34 +02:00
Grzegorz Bizon 97a2de9e03 Make it possible to switch ref in badges view 2016-04-06 19:56:34 +02:00
Grzegorz Bizon a2bbd2501a Add project header title in project badges view 2016-04-06 19:56:34 +02:00
Grzegorz Bizon dffdb0d036 Use highlight helper to render badges code syntax 2016-04-06 19:56:34 +02:00
Grzegorz Bizon 58d63a66a0 Improve view with list of badges 2016-04-06 19:56:34 +02:00
Grzegorz Bizon b7fa7c4d59 Extend build status badge, add html/markdown methods 2016-04-06 19:56:34 +02:00
Grzegorz Bizon 88fc7ccdda Add project badges view prototype 2016-04-06 19:56:34 +02:00
Phil Hughes 4d463c3b0f Fixed delete comment button color 2016-04-06 09:54:49 +01:00
Alfredo Sumaran d2afeb8dde Do not add location badge when creating a group or project 2016-04-05 17:29:40 -05:00
Jacob Schatz 4258589d95 Merge branch 'note-form-design' into 'master'
Notes form design update

Part of #3401

See merge request !3442
2016-04-05 19:34:16 +00:00
Felipe Artur 32c7e42b61 Improve code 2016-04-05 11:53:39 -03:00
Phil Hughes 4d9d06ec50 Removed emoji button from notes form 2016-04-05 09:12:26 +01:00
Jacob Schatz 6713600793 Merge branch 'remove-2fa-status' into 'master'
Remove 2FA status on enable page

The 2FA status on the enabling page is useless, since it always is `disabled`. A user is enabling 2FA, so he already knows that it is disabled.

### Before

![Screenshot_2016-03-29_12.41.27](/uploads/4800a13a82f176077a11ecaf13ed0cb1/Screenshot_2016-03-29_12.41.27.png)

### After
![Screenshot_2016-03-29_12.40.55](/uploads/a77e8acd7cf99190bbd6bd340542ad10/Screenshot_2016-03-29_12.40.55.png)

See merge request !3436
2016-04-04 23:14:04 +00:00
Dmitriy Zaporozhets 8f9586421d Merge branch 'admin-pages-layout' into 'master'
Improve UI for admin/groups page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

cc @jschatz1 @skyruler 

See merge request !3523
2016-04-04 22:25:06 +00:00
Dmitriy Zaporozhets be6f1c7427 Single quotes paradise
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-04 23:52:27 +02:00
Jacob Schatz 638012c23f Merge branch 'dz-admin-area-fixes' into 'master'
Set of UI fixes for admin area



See merge request !3525
2016-04-04 20:01:46 +00:00
Jacob Schatz 1926e55e1f Merge branch 'hide_profile_activity_on_mobile' into 'master'
Hide user profile activity graph on mobile

closes #14507 

## Before
![Screen_Shot_2016-03-26_at_10.28.21_PM](/uploads/5d5e2f77de936c2f2cd8a95132720a81/Screen_Shot_2016-03-26_at_10.28.21_PM.png)

## After
![Screen_Shot_2016-03-26_at_10.27.01_PM](/uploads/c011497b31368a0b7aa7d851541ac301/Screen_Shot_2016-03-26_at_10.27.01_PM.png)

## Medium width screen
![fix2](/uploads/2a5eb2d01f1a516991cd3e2b35b8aadc/fix2.gif)

See merge request !3412
2016-04-04 19:52:31 +00:00
Jacob Schatz 2fb0ef51d6 Merge branch 'fix-award-emoji-menu' into 'master'
Fix award emoji picker for relative_url

MR !2888 caused a regression where the emoji picker does not load when
using relative_url, because the path for the controller was hardcoded.

See merge request !3493
2016-04-04 19:47:15 +00:00
Jacob Schatz d5169a60d4 Merge branch '14083-build-labels' into 'master'
Add labels to block element

Fixes #14083 


Before:![Screen_Shot_2016-04-04_at_11.22.27_AM](/uploads/c35afd95ebca1b72f2aa37c72dc3c1a9/Screen_Shot_2016-04-04_at_11.22.27_AM.png)

After: ![Screen_Shot_2016-04-04_at_11.21.34_AM](/uploads/94f180858cf8fe2fc7eeec541ce66d44/Screen_Shot_2016-04-04_at_11.21.34_AM.png)

See merge request !3492
2016-04-04 18:29:40 +00:00
Dmitriy Zaporozhets f9fd003159 Fix missing paddings in admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-04 19:41:31 +02:00
Dmitriy Zaporozhets 3e6d27ee59 Dont use monospace font for names
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-04 19:36:21 +02:00
Dmitriy Zaporozhets d5fadfe0f5 Improve UI for admin/groups page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-04 19:23:50 +02:00
Stan Hu 7877138958 Fix creation of merge requests for orphaned branches
Closes #14875
2016-04-04 04:51:05 -07:00
Phil Hughes 3b4c4dd7b3 Logged out box 2016-04-04 10:48:49 +01:00
Phil Hughes 0581df2971 Discussion form 2016-04-04 10:48:49 +01:00
Phil Hughes f0d2f370cc Removed css code that isnt used 2016-04-04 10:48:49 +01:00
Phil Hughes af3284d98b Focus style for comment form 2016-04-04 10:48:49 +01:00
Phil Hughes 38e32780a8 Hides current user icon on mobile 2016-04-04 10:48:49 +01:00
Phil Hughes 3c2b0e7572 Added toolbar to comment form 2016-04-04 10:48:49 +01:00
Phil Hughes 0331fa3f3d Restyling on elements in comment form 2016-04-04 10:48:49 +01:00
Phil Hughes b7f0b22b9f Started refactoring of note form 2016-04-04 10:48:49 +01:00