Commit Graph
14086 Commits
Author SHA1 Message Date
Jacob SchatzandYorick Peterse 785bce1cb2 Merge branch 'notification-email-badge-alignment' into 'master'
Updated spacing between notification label and button

![Screen_Shot_2016-04-28_at_11.36.26](/uploads/7b33e78e85688d96f878272ee93038ba/Screen_Shot_2016-04-28_at_11.36.26.png)

Closes #16552

See merge request !3965
2016-05-03 09:43:03 +00:00
Robert SpeicherandYorick Peterse aa664af3dd Merge branch '15527-fix-wiki-page-creation-issue' into 'master'
Fix error when trying to create a wiki page

Closes #15527, #15569, #15623, #15630, #15637, #15653, #15870, #16558, #16875, #16987, #17016, https://github.com/gitlabhq/gitlabhq/issues/10317.

See merge request !3924
2016-05-03 09:42:16 +00:00
Robert Speicher 6f0cadca87 Merge remote-tracking branch 'dev/8-7-stable' into 8-7-stable 2016-05-02 20:00:11 -04:00
Jacob SchatzandYorick Peterse ea066cc1bf Merge branch 'async-new-branch-button' into 'master'
Load the "New Branch" button asynchronously

Here's how it looks like for logged in users:

![new_branch](/uploads/718e3d9016a50a0432b9541dde5ca74c/new_branch.gif)

And here it is for anonymous users (or when a new branch can't be created by a logged in user):

![new_branch_anonymous](/uploads/dce42ee6a7dd7708443cdfdb56389d46/new_branch_anonymous.gif)

See merge request !3855
2016-04-29 00:33:45 +02:00
Jacob SchatzandYorick Peterse 81dafb7113 Merge branch 'sidebar-label-link' into 'master'
Updated label links to work correctly for filtering

See !3846#note_5033951

See merge request !3920
2016-04-27 19:39:12 +00:00
Robert Speicher f50306a7b1 Merge remote-tracking branch 'origin/8-7-stable' into 'dev/8-7-stable' 2016-04-27 12:48:05 -04:00
Robert SpeicherandYorick Peterse 6044fd7e46 Merge branch 'rs-notes-privilege-escalation' into 'master'
Prevent privilege escalation via notes API

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15577

See merge request !1964
2016-04-27 08:43:33 +00:00
Jacob SchatzandYorick Peterse a1db1355d2 Merge branch 'master' into 'master'
Fixed width of .search-location-badge as it was causing issues in Safari.

Fixed width of .search-location-badge as it was causing issues in Safari.

Fixes issue #15541 and is a minor CSS only change so [ci skip]

# Before

Safari:
![Screen_Shot_2016-04-24_at_22.35.38](/uploads/74388670fde3af94429d83b954833bd3/Screen_Shot_2016-04-24_at_22.35.38.png)

# After

Safari:
![Screen_Shot_2016-04-24_at_21.59.49](/uploads/177d0d8fda665165dff5006930604fc6/Screen_Shot_2016-04-24_at_21.59.49.png)

Chrome:
![Screen_Shot_2016-04-24_at_21.59.40](/uploads/6764cd5864901210f4f8eff4388fd6db/Screen_Shot_2016-04-24_at_21.59.40.png)

# CSS class referenced in the following files:

`./app/assets/javascripts/search_autocomplete.js.coffee`

`./app/assets/stylesheets/pages/search.scss`

…and is visible on the search bar on every page.

See merge request !3900
2016-04-27 08:38:28 +00:00
Jacob SchatzandYorick Peterse f2afc5dd26 Merge branch 'emoji-unicode-fix' into 'master'
Fixes issue with emoji comments not showing correct emoji image

Previously it would look for the unicode character inside the award menu. But this menu might not always be there.

Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character

Fixes #15512

See merge request !3885
2016-04-26 16:05:12 +00:00
Robert SpeicherandYorick Peterse 3b83ed2125 Merge branch '15437-fix-xss-in-issue-tracker-service' into 'master'
Prevent XSS via custom issue tracker URL

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15437

See merge request !1955
2016-04-25 21:55:52 +00:00
Robert SpeicherandYorick Peterse df1b1e58be Merge branch '15591-fix-project-leak-in-new-mr-view' into 'master'
Prevent information disclosure via new merge request page

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15591.

See merge request !1963
2016-04-25 21:53:17 +00:00
Robert SpeicherandYorick Peterse 61013f11bb Merge branch 'fix-impersonation-issue' into 'master'
Prevent privilege escalation via "impersonate" feature

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15548

See merge request !1956
2016-04-25 21:52:40 +00:00
Robert SpeicherandYorick Peterse 516900b9dc Merge branch 'fix-private-snippet-api' into 'master'
Prevent information disclosure via snippet API

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15580

See merge request !1958
2016-04-25 21:51:52 +00:00
Jacob SchatzandYorick Peterse f03c454809 Merge branch 'issue_15434' into 'master'
Fixes XSS injection

REF: https://gitlab.com/gitlab-org/gitlab-ce/issues/15434

**Without the fix**

![xss1](/uploads/0a7b0b15fb87066965a7c73f1dbaa815/xss1.gif)


**With the fix**

![xss2](/uploads/473cfa0aa80656f24c58aebf1fd97fff/xss2.gif)


See merge request !1952
2016-04-25 21:50:32 +00:00
Jacob SchatzandYorick Peterse 320e0b7fa7 Merge branch 'blur-award-btn' into 'master'
Triggers blur after clicking award button

![blur](/uploads/6cd53a5ac314e8048c656685935747e2/blur.gif)

Fixes #15511

See merge request !3881
2016-04-25 21:55:11 +02:00
Jacob SchatzandYorick Peterse 383984b973 Merge branch 'project-dropdown-link-click-fix' into 'master'
Fixed issue with project dropdown links not being clickable



See merge request !3870
2016-04-25 21:55:02 +02:00
Dmitriy ZaporozhetsandYorick Peterse 44a18c64e3 Merge branch 'fix-issue-with-assignee-not-updating' into 'master'
Fixed issue with assignee object not being returned

Closes #15515

See merge request !3877
2016-04-25 21:54:55 +02:00
Yorick Peterse a3783cde1a Merge branch 'fix-cache-invalidations' into 'master'
Fix Error 500 due to stale cache when projects are renamed or transferred

See merge request !3865
2016-04-25 21:54:09 +02:00
Rémy CoutableandYorick Peterse 8d7c63b708 Merge branch '15470-fix-unknown-license-not-shown' into 'master'
Fix license detection to detect all license files, not only known licenses

Fixes #15470.

See merge request !3878
2016-04-25 21:53:19 +02:00
Robert SpeicherandYorick Peterse 009e2ed1c7 Merge branch '15513-fix-undefined-can-method' into 'master'
Use the `can?` helper instead of `current_user.can?`

Fixes #15513.

See merge request !3882
2016-04-25 21:52:54 +02:00
Jacob SchatzandYorick Peterse 9c1087ef8e Merge branch 'rs-todo-middle-click' into 'master'
Allow middle-click on a Todo row to open in a new tab



See merge request !3899
2016-04-25 19:50:59 +00:00
Jacob SchatzandYorick Peterse 438f41594a Merge branch 'escape-label-title' into 'master'
Correctly escapes label title in filters

Fixes #15522

See merge request !3880
2016-04-25 19:49:57 +00:00
Jacob SchatzandYorick Peterse 839692df6c Merge branch 'word-break' into 'master'
Don't break line in middle of word

<img src="/uploads/cceb1a4212ff7785ace03cd6468edf85/Screen_Shot_2016-04-21_at_3.32.00_PM.png" width="500px">

See merge request !3864
2016-04-25 19:48:14 +00:00
Rémy CoutableandYorick Peterse 76c215cbd0 Merge branch 'issue_3799' into 'master'
Allow filtering by Owned projects on dashboard page

Closes #3799 

![Screen_Shot_2016-04-15_at_9.40.52_PM](/uploads/440498c5647bda282304891307931a02/Screen_Shot_2016-04-15_at_9.40.52_PM.png)

See merge request !3762
2016-04-22 10:59:09 +02:00
Robert SpeicherandYorick Peterse 8bfaa1ebda Merge branch 'label-text-color-sidebar' into 'master'
Fixes text color on labels in sidebar

Previously the labels in the sidebar would just have `#FFF` text color which could cause problems with a light background color.

With this, the text color comes from the JSON.

See merge request !3846
2016-04-22 10:56:32 +02:00
Rémy CoutableandYorick Peterse 778b1f46b4 Merge branch 'rs-diff_view' into 'master'
Always read diff_view setting from the cookie

Prior, when the user had their view set to "parallel" and then visited a
merge request's changes tab _without_ passing the `view` parameter via
query string, the view would be parallel but the `Notes` class was
always instantiated with the default value from `diff_view` ("inline"),
resulting in broken markup when the form to add a line note was
dynamically inserted.

The cookie is set whenever the view is changed, so this value should
always be up-to-date.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14557 and https://gitlab.com/gitlab-org/gitlab-ce/issues/15285

See merge request !3732
2016-04-22 10:56:04 +02:00
Robert SpeicherandYorick Peterse dd5a29e8da Merge branch 'confirmation-screen' into 'master'
Improved email confirmation UX

Closes #4228

See merge request !3184
2016-04-22 10:55:48 +02:00
Grzegorz BizonandYorick Peterse fbb819a645 Merge branch 'fix/private-labels-permissions' into 'master'
Fix vulnerability that leaks private labels and milestones

## Summary

This fixes vulnerability that leaks information about private labels and milestones because of  insecure direct object reference in issueable create service.
This affects merge requests and issues.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/15439

## Fix

This MR introduces additional check that rejects labels and milestone that does not belong to the same project issue/merg request does.

## Further work

`IssuableBaseService` may benefit from encapsulating filters in separate class/module, which then may improve coherency in this class.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15439

See merge request !1954
2016-04-22 10:53:54 +02:00
Jacob SchatzandYorick Peterse 178878719f Merge branch '15413-firefox-line-numbers' into 'master'
Remove float from blame link icon

Closes #15413   
<img src="/uploads/af6aea9102e1b42e5e92783ce818863c/Screen_Shot_2016-04-21_at_1.57.56_PM.png" width="200px">



See merge request !3861
2016-04-21 22:34:18 +00:00
Robert SpeicherandYorick Peterse 20a3c1dfb2 Merge branch 'rs-issue-15408' into 'master'
Fix undefined local variable error in Invalid MR template

Closes #15408

See merge request !3857
2016-04-21 22:33:30 +00:00
Jacob SchatzandYorick Peterse 8f34f10e88 Merge branch '15445-file-renames' into 'master'
File name change appears on one line

Closes #15445

<img src="/uploads/51714555be63af16b810cf528de49192/Screen_Shot_2016-04-21_at_9.22.43_AM.png" width="500px">

See merge request !3854
2016-04-21 22:32:46 +00:00
Jacob SchatzandYorick Peterse e93c95204d Merge branch 'note-username-text-color' into 'master'
Fixed issue with author link color on dark diffs

Correctly added a color to the author link

![Screen_Shot_2016-04-21_at_08.55.05](/uploads/ffa9e12e868c7b71fa4dd9244114274a/Screen_Shot_2016-04-21_at_08.55.05.png)

Fixes #15444

See merge request !3847
2016-04-21 22:31:45 +00:00
Jacob SchatzandYorick Peterse c89d30ef48 Merge branch 'label-dropdown-fix' into 'master'
Fixes "create label" functionality on label dropdown

**Issue sidebar**

![label_dropdown](/uploads/2a056136fc88626530fc275ded0c2aa3/label_dropdown.gif)

**Issues page**

![label_dropdown_issues](/uploads/965fd20f5b206499e9b11a64556c5240/label_dropdown_issues.gif)



See merge request !3670
2016-04-21 22:30:41 +00:00
Yorick Peterse 583fec3d3d Merge branch '15465-fix-sort-by-due-date' into 'master'
Remove the `.distinct` when finding issues

See merge request !3858
2016-04-21 22:27:52 +00:00
Yorick Peterse a12496ccfd Merge branch 'remove-update-files' into 'master'
Removed JS update templates

See merge request !3814
2016-04-21 22:25:50 +00:00
Douwe MaanandYorick Peterse 059b6edaf8 Merge branch 'fix/label-filters' into 'master'
Filter labels by including ALL filter titles

Fixed query to use `AND` and not `OR`. Refactored relevant specs

See merge request !3815
2016-04-21 15:49:23 +00:00
Rémy CoutableandYorick Peterse fee23a52ff Merge branch 'issue_5838' into 'master'
Show project members only for members

fixes #5838 

See merge request !3752
2016-04-21 15:49:02 +00:00
Jacob SchatzandYorick Peterse f59c134ff8 Merge branch 'revert-sentry-js' into 'master'
Revert "Merge branch 'sentry-js' into 'master'"

This reverts commit 0f309794e7, reversing
changes made to 1e596fef1c.

See merge request !3851
2016-04-21 12:30:13 +00:00
Jacob SchatzandYorick Peterse 52e53e0d8c Merge branch 'disable_spellcheck_for_username_field' into 'master'
Disable spellcheck and autocorrect for username field in admin page

closes #14855

## before
![Screen_Shot_2016-04-19_at_9.25.12_AM](/uploads/19387c4a11a879e9034a2179e932436e/Screen_Shot_2016-04-19_at_9.25.12_AM.png)

## after
![Screen_Shot_2016-04-19_at_9.25.47_AM](/uploads/60f4eba6a97201333dc64e46d625aac2/Screen_Shot_2016-04-19_at_9.25.47_AM.png)

See merge request !3730
2016-04-21 12:28:06 +02:00
Jacob SchatzandYorick Peterse 15f62ed65f Merge branch 'note-form-text-color' into 'master'
Fixes issue with note form inheriting text color

It was only really noticeable on dark themed diffs

![Screen_Shot_2016-04-20_at_14.44.58](/uploads/4f32b487de7e4c09a494dc3c8c767ece/Screen_Shot_2016-04-20_at_14.44.58.png)

See merge request !3834
2016-04-21 10:23:48 +00:00
Jacob SchatzandYorick Peterse b61927e513 Merge branch '15104-mobile-comment-bug' into 'master'
Discussion note icon shows up when you click on diff on touch screen

Fixes #15104 

* Fix bug that stopped discussion note button from showing up on iOS
* Shifted button a few `px` to fix slight cutoff
<div>
<img src="/uploads/9d507091f33aa69ef68323386bf3a5c2/Screen_Shot_2016-04-15_at_12.08.46_PM.png" width="300px">
<img src="/uploads/a964a2a46636cbe4593abf272b5796f7/Screen_Shot_2016-04-15_at_12.11.40_PM.png" width="300px">
</div>

See merge request !3755
2016-04-21 10:17:50 +00:00
Jacob SchatzandYorick Peterse d793dc8b00 Merge branch 'revert-diff-scroll' into 'master'
Wrap all code in diffs

Closes #15382  
Closes #15422  
All diff code wraps to next line instead of scrolling

<img src="/uploads/ec5754919bac0b027fcb122bb88435b3/Screen_Shot_2016-04-20_at_12.22.27_PM.png" width="500px">

See merge request !3838
2016-04-21 10:07:55 +00:00
Robert SpeicherandYorick Peterse 82d8c74f76 Merge branch 'due-date-frontend' into 'master'
Add due date to issues

Closes: #12709

See merge request !3614
2016-04-21 10:07:02 +00:00
Robert SpeicherandYorick Peterse 7046aedd43 Merge branch 'sentry-js' into 'master'
Add Sentry logging for JavaScript errors

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12675

See merge request !3795
2016-04-21 10:06:51 +00:00
Jacob SchatzandYorick Peterse cf69f9ca9e Merge branch 'fix_infinite_scroll_breaks_on_back_button_activity_feed' into 'master'
fix bug causing the infinite scrolling in activity feeds to break when you click a link and navigate back

![arrg_](/uploads/53b2a01d3b55938cc12c805e1a81ff6b/arrg_.gif)

See merge request !3835
2016-04-21 10:01:52 +00:00
Jacob SchatzandYorick Peterse 73b8072d35 Merge branch 'right-sidebar-z-index' into 'master'
Increased z-index of right sidebar

Fixes issue with active button overlapping it

Closes #15243

See merge request !3722
2016-04-21 10:01:41 +00:00
Jacob SchatzandYorick Peterse e1c99358dc Merge branch '15213-dialog-input' into 'master'
Add margin to top of form actions

Closes #15213

Also fixes other modal inputs (like add new directory, etc)  

![Screen_Shot_2016-04-20_at_1.47.14_PM](/uploads/14b474da2f86dcc3c1afd9e8ea09e812/Screen_Shot_2016-04-20_at_1.47.14_PM.png)

See merge request !3841
2016-04-21 10:01:33 +00:00
Jacob SchatzandYorick Peterse 523f7abef9 Merge branch 'remove-duplicate-ids' into 'master'
Removed duplicate ID's from the HTML



See merge request !3818
2016-04-21 10:01:24 +00:00
Jacob SchatzandYorick Peterse 0907e863dc Merge branch 'issue_15366' into 'master'
Render relative timestamps for all commits in projects commit list

fixes #15366 

See merge request !3821
2016-04-21 10:00:21 +00:00
Jacob SchatzandYorick Peterse 6f11c35ab1 Merge branch 'edit-link-anchor-stop' into 'master'
Fixed issue with sidebar edit links toggling anchor

This caused an issue with the page scrolling from the bottom to the top. Also stopped the dropdown links doing the same.

See merge request !3819
2016-04-21 10:00:12 +00:00