Commit Graph
13633 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
Annabel Dunstone f9014e4ec6 Use meta key to open todo in new tab 2016-04-08 09:46:32 -07:00
Jacob Schatz 6dbc5f9f33 Merge branch 'code-wrapping' into 'master'
Fix side-by-side code format & commit message wrap

![Screen_Shot_2016-04-07_at_1.31.28_PM](/uploads/bad00284e4dfbec1fdd75220c34f4a98/Screen_Shot_2016-04-07_at_1.31.28_PM.png)

![Screen_Shot_2016-04-07_at_1.32.23_PM](/uploads/7cd344765025e93d0035934a473b4bb3/Screen_Shot_2016-04-07_at_1.32.23_PM.png)

See merge request !3605
2016-04-07 22:00:54 +00: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 dc3de6e132 Revert "Merge branch 'fix-sidebar-exapnd' into 'master'"
This reverts merge request !3520
2016-04-07 20:33:01 +00:00
Annabel Dunstone 422a924758 Fix side-by-side code format & commit message wrap 2016-04-07 13:27:39 -07:00
Jacob Schatz 1060467bb8 Merge branch 'indentation-bug' into 'master'
Preserve white space



See merge request !3602
2016-04-07 18:28:48 +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
Annabel Dunstone a81fcf8bd6 Indentation update 2016-04-07 09:06:46 -07:00
Annabel Dunstone f84d9e5389 Preserve white space 2016-04-07 08:55:16 -07: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
Felipe Artur 0bef4b9764 Implement review suggestions 2016-04-07 10:59:24 -03:00
Jacob Schatz d76a769d24 Remove duplication. Remove JS data attributes 2016-04-07 08:32:37 -04:00
Grzegorz Bizon b30ebdaa1a Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
* 'master' of dev.gitlab.org:gitlab/gitlabhq:
  Make sessions controller specs more explicit
  Fix 2FA authentication spoofing vulnerability
  Add specs for sessions controller  including 2FA
2016-04-07 14:10:28 +02:00
Rémy Coutable 237324cc17 Merge branch 'fix/2fa-authentication-spoofing' into 'master'
Fix 2FA authentication spoofing

## Summary

This is security fix for vulnerability described at 
https://gitlab.com/gitlab-org/gitlab-ce/issues/14900.

Attacker was able to bypass password authentication of users that have 2FA enabled, and consequently sign is as a different user, without knowing his password, if he managed to guess 2FA One Time Password for that user.

It was also possible to enumerate users and check if they have 2FA enabled, because GitLab responded with different error for each case.

## Fix

This MR attempts to change default user search scope if `otp_user_id` session variable has been set. If it is present, it means that user has 2FA enabled, and has already been verified with login and password. In this case we should look for user with `otp_user_id` first, before picking it up by `login`.

Both, 2FA authentication spoofing and 2FA discovery have been covered by specs.

## Further work

Current 2FA code is a bit tricky, so it probably needs some refactoring.



See merge request !1947
2016-04-07 11:56:44 +00:00
Jacob Schatz 92649ca97a Hide "assign to me" link if not allowed 2016-04-07 07:09:31 -04:00
Yorick Peterse a918e8bf27 Merge branch 'fix-project-404-cache-issue' into 'master'
Expire caches after project creation to ensure a consistent state

See merge request !3586
2016-04-07 10:31:04 +00:00
Rémy Coutable 144912851c Merge branch 'update_main_lang_if_unset' into 'master'
Only update main language if it is not already set

Related to gitlab-org/gitlab-ce#14937 (but does not fully fix) This is a temporary fix so performance isn't affected so much. 

cc @yorickpeterse @ayufan how does this look?

See merge request !3556
2016-04-07 09:41:51 +00:00
Grzegorz Bizon 00da609cfd Fix 2FA authentication spoofing vulnerability
This commit attempts to change default user search scope if otp_user_id
session variable has been set. If it is present, it means that user has
2FA enabled, and has already been verified with login and password. In
this case we should look for user with otp_user_id first, before picking
it up by login.
2016-04-07 11:19:29 +02: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
Rémy Coutable d62a3decf9 Merge branch 'fix_14638' into 'master'
Fixes #14638.

The SQL query was ambiguous and in this case we want to filter projects.

See merge request !3462
2016-04-07 08:35:38 +00:00
Stan Hu 27b9f64efb Expire caches after project creation to ensure a consistent state
Closes #14961
2016-04-07 00:29:01 -07:00
Stan Hu 924e4b3700 Return status code 303 after a branch DELETE operation to avoid project deletion
Closes #14994
2016-04-06 21:11:10 -07:00
Jacob Schatz b471c76bcb Reset MR opts 2016-04-06 21:46:12 -04:00
Robert Speicher 936be025cd Merge branch 'saml-external-groups' into 'master'
Allow SAML to identify external users and set them as such

Related to #4009

Fixes #14577

This allows SAML to retrieve group information form the `SAML Response`
and match that to a setting that will flag all matching users as external.

See merge request !3530
2016-04-07 00:35:08 +00: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
Jacob Schatz 7c6c933c9f Merge branch 'issue_14952' into 'master'
Do not add location badge when creating a group or project

Closes #14952 

![](/uploads/778d0cbccffc717d601a91528ca8eb3c/Screen_Shot_2016-04-05_at_5.34.10_PM.png)

![](/uploads/dbd9eb06b510a6ac091dcf2e3fcb9c88/Screen_Shot_2016-04-05_at_5.34.21_PM.png)

See merge request !3555
2016-04-06 22:55:15 +00:00
Jacob Schatz d2f7813078 Merge branch '14866-url-overflow' into 'master'
Wrap code blocks to next line

Closes #14866 

![Screen_Shot_2016-04-06_at_9.27.06_AM](/uploads/8bed5c17b17c9d15fe34dc7161d31e09/Screen_Shot_2016-04-06_at_9.27.06_AM.png)

See merge request !3573
2016-04-06 22:25:30 +00:00
Annabel Dunstone 86d346b6f4 Change word-break to word-wrap 2016-04-06 14:40:29 -07: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
Annabel Dunstone dcdf0b2af2 Horizontally scroll code blocks instead of wrapping 2016-04-06 13:20:58 -07:00
Annabel Dunstone ebb91c7f04 Wrap code blocks to next line 2016-04-06 13:20:58 -07:00
Drew Blessing 935bf7271d Only update main language if it is not already set 2016-04-06 14:56:40 -05:00
Alfredo Sumaran d1ad639010 Do not fire blur event when clicking a suggestion 2016-04-06 14:28:15 -05:00
Jacob Schatz 452d1d4a8c Merge branch 'dropdown-enter-select-fix' into 'master'
Fixed issue with enter key not selecting correct value in dropdown



See merge request !3563
2016-04-06 19:16:23 +00:00
Jacob Schatz 61d0cf0c61 Merge branch 'delete-icon-color' into 'master'
Fixed delete comment button color

![Screen_Shot_2016-04-06_at_09.55.38](/uploads/526c03db67b0fc7dc9876439f4be2b6b/Screen_Shot_2016-04-06_at_09.55.38.png)

See merge request !3562
2016-04-06 19:13:46 +00:00
Jacob Schatz 205af25a33 Merge branch '14342-merge-button' into 'master'
Update shades of red

Closes #14342 

Before:
![Screen_Shot_2016-04-05_at_12.11.44_PM](/uploads/58cf841fe9527a222bcf70c64f93e2fc/Screen_Shot_2016-04-05_at_12.11.44_PM.png)

Fixed:
![Screen_Shot_2016-04-05_at_12.10.56_PM](/uploads/98358b6a20aaee2ca777eee87075085e/Screen_Shot_2016-04-05_at_12.10.56_PM.png)

See merge request !3549
2016-04-06 19:08:49 +00:00
Alfredo Sumaran 5f4ce722c0 Display clear button only if input has a value 2016-04-06 13:55:49 -05:00
Alfredo Sumaran ee87d15cf4 Change approach, do not use timeouts 2016-04-06 13:23:18 -05:00
Grzegorz Bizon 7689e87854 Use default branch when displaying list of badges 2016-04-06 19:56:35 +02: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