Commit Graph
13680 Commits
Author SHA1 Message Date
Phil Hughes a650af1226 Moved loading icon to match todo loading icon 2016-04-12 09:48:39 +01:00
Phil Hughes 3cfbd2b160 Added loading icon to import buttons
See #14488 for more details
2016-04-11 18:27:34 +01:00
Jacob Schatz 4087bd16e8 Merge branch 'dashboard-filter-milestone' into 'master'
Fixed issue with dashboard/issues not filtering by milestone

Closes #15128

See merge request !3650
2016-04-11 13:56:29 +00:00
Dmitriy Zaporozhets 5999fec7a3 Merge branch 'rs-form_errors' into 'master'
Standardize the way we check for and display form errors

- Some views had a "Close" button. We've removed this, because we don't
  want users accidentally hiding the validation errors and not knowing
  what needs to be fixed.
- Some views used `li`, some used `p`, some used `span`. We've
  standardized on `li`.
- Some views only showed the first error. We've standardized on showing
  all of them.
- Some views added an `#error_explanation` div, which we've made
  standard.

See merge request !3531
2016-04-11 12:01:50 +00:00
Jacob Schatz 69a8bf367c Merge branch 'mr-ui-update' into 'master'
Updated UI for new merge request

Closes #2540 

![Screen_Shot_2016-03-29_at_12.53.18](/uploads/426e603675171f0dc4e0af83c7762eba/Screen_Shot_2016-03-29_at_12.53.18.png)

![Screen_Shot_2016-03-29_at_12.53.13](/uploads/645ad7955acfb9f7693245fcc048ee49/Screen_Shot_2016-03-29_at_12.53.13.png)

See merge request !3228
2016-04-11 11:25:40 +00:00
Phil Hughes 2f4dc45da2 Fixed issue with dashboard/issues not filtering by milestone
Closes #15128
2016-04-11 11:38:24 +01:00
Dmitriy Zaporozhets 986b4a54ee Merge branch 'rs-remove-markdown-tips' into 'master'
Remove `random_markdown_tip` helper

Only usage got removed in !3442

See merge request !3637
2016-04-11 10:26:36 +00:00
Phil Hughes 12ff7ee933 Merge request mobile spacing 2016-04-11 09:54:32 +01:00
Phil Hughes a4fff0e033 Fixed dropdown title overlap 2016-04-11 09:52:12 +01:00
Phil Hughes 643fe43d78 Addressed feedback
Removed important from css
2016-04-11 09:43:59 +01:00
Jacob Schatz 6e47f30932 Merge branch 'issue_14353' into 'master'
Ignore toggling the sidebar for resolutions over 1200px width

Closes #14353 
![sidebar1](/uploads/4b8d0eaa1b320c319239cb572932f740/sidebar1.gif)

See merge request !3547
2016-04-11 00:40:54 +00:00
Jacob Schatz d2c9137fea Merge branch 'prevent_users_from_upvoting_downvoting_emoji' into 'master'
prevent users from being able to both upvote and downvote



See merge request !3495
2016-04-11 00:28:12 +00:00
Alfredo SumaranandJacob Schatz 836301676a Use existence operator instead 2016-04-10 20:03:36 -04:00
Alfredo SumaranandJacob Schatz fe0aa82325 Check existence of variable method
This happens because tab's `shown` event is triggered first if we enter directly to the diff page therefore Breakpoints class is not initialized yet.
2016-04-10 20:03:36 -04:00
Alfredo SumaranandJacob Schatz a7c11fe473 Ignore toggling sidebar for above 1200px resolution 2016-04-10 20:03:36 -04:00
Jacob Schatz 0631a1e9e2 Merge branch 'rs-markdown-preview-tabindex' into 'master'
Remove tab stop from "Write", "Preview", "Go full screen" links

Closes #15089

See merge request !3635
2016-04-10 14:40:52 +00:00
Jacob Schatz 283ecf6e48 Merge branch 'redesign_labels_page' into 'master'
Redesign labels page

closes #14227 

## Desktop
![Screen_Shot_2016-04-05_at_7.19.37_PM](/uploads/a52b764565b6e2739fb6932178f8bde5/Screen_Shot_2016-04-05_at_7.19.37_PM.png)

## Mobile
![Screen_Shot_2016-04-04_at_6.40.57_PM](/uploads/9804b074126fcdb6755918e9f4c472a7/Screen_Shot_2016-04-04_at_6.40.57_PM.png)

See merge request !3507
2016-04-10 14:05:22 +00:00
Robert Speicher f833726ec0 Remove random_markdown_tip helper
Only usage got removed in !3442
2016-04-09 20:43:59 -04:00
Robert Speicher f03b5c4fde Remove tab stop from "Write", "Preview", "Go full screen" links
Closes #15089
2016-04-09 20:02:36 -04:00
Robert Speicher 2378ec0d63 Add a program tag to Sentry Raven context
This will let us filter errors by the program environment in which they
were encountered.

Source: http://stackoverflow.com/a/28370539/223897

Closes #15092
2016-04-09 19:57:27 -04:00
Arinde Eniola b95c9217b7 prevent users from being able to both upvote and downvote 2016-04-09 23:31:45 +01:00
Jacob Schatz 593972ca6a Merge branch '14400-diff-redesign' into 'master'
Diff redesign

Fixes #14400 
Fixes #13500 

![diffs_redesign](/uploads/16da9557e497114d886ef5ece2f306b3/diffs_redesign.gif)

See merge request !3476
2016-04-09 22:19:47 +00:00
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
Annabel Dunstone e65bccfcc3 Remove comment count & icon from side by side view 2016-04-07 15:33:18 -07:00
Annabel Dunstone d76878b960 Diff touch ups 2016-04-07 15:33:18 -07:00
Annabel Dunstone 6ee2069768 Fix lint errors 2016-04-07 15:33:18 -07:00
Annabel Dunstone 04e798a515 Remove comment count & icon 2016-04-07 15:33:18 -07:00
Annabel Dunstone dab4ac54b6 Diff design updates 2016-04-07 15:33:18 -07:00
Annabel Dunstone 3cfeb37558 Merge conflict fixes 2016-04-07 15:33:18 -07:00
Annabel Dunstone de63de18d7 Update diff colors and icons 2016-04-07 15:33:18 -07:00
Annabel Dunstone c80c1da780 Move diff colors to variables 2016-04-07 15:33:18 -07:00
Annabel Dunstone b59d4e861c Change reply button to text field 2016-04-07 15:33:18 -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