home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 20:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
27,483 Commits 48 Branches 340 Tags
b18bd9c85f0d925aaa6ecf531673958bd97082fc
Commit Graph
27483 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Lopez b18bd9c85f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 2016-04-22 17:02:29 +02:00
Dmitriy Zaporozhets a600b4b1c0 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-22 14:58:18 +00:00
James Lopez a0ede57dd6 Merge branches 'feature/project-export' and 'feature/project-import' into feature/project-export-ui-experimental 2016-04-22 15:29:35 +02:00
Phil Hughes 32be8bd2b1 Fixed issue with assignee object not being returned 
Closes #15515
 2016-04-22 13:30:58 +01:00
James Lopez fedfba5519 more refactoring - easier guessing path changes 2016-04-22 12:49:37 +02:00
James Lopez 8f973b8f68 more refactoring - easier guessing path changes 2016-04-22 12:45:20 +02:00
James Lopez 45032bf403 Merge branch 'feature/project-export' into feature/project-import 2016-04-22 12:18:47 +02:00
James Lopez 4256743686 refactored path stuff 2016-04-22 12:18:11 +02:00
Rémy Coutable d5398e9656 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 08:40:01 +00:00
Achilleas Pipinellis 15e225940b Merge branch 'doc-gh-import-additions' into 'master' 
Add newest enhancements to GH importer docs

[ci skip]

See merge request !3867
 2016-04-22 08:36:37 +00:00
Robert Speicher 2193a3535b Merge branch 'confirmation-screen' into 'master' 
Improved email confirmation UX

Closes #4228

See merge request !3184
 2016-04-22 08:34:59 +00:00
Achilleas Pipinellis 846a9ef5ad Add newest enhancements to GH importer docs 
[ci skip]
 2016-04-22 11:20:37 +03:00
Achilleas Pipinellis c39032937a Merge branch 'doc_note_cherry_pick' into 'master' 
Use new Note styleguide



See merge request !3866
 2016-04-22 07:50:35 +00:00
Rémy Coutable 5a8873f362 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 07:49:46 +00:00
Achilleas Pipinellis de39959f55 Use new Note styleguide 
[ci skip]
 2016-04-22 10:42:30 +03:00
Grzegorz Bizon 988dad4649 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 06:51:40 +00:00
Grzegorz Bizon 55df95c388 Add Changelog entry for private labels security fix 2016-04-22 08:02:02 +02:00
Grzegorz Bizon 01ab6d704c Use association search in issuable create service 2016-04-22 08:01:50 +02:00
Grzegorz Bizon 006d8b268c Add affinity checks in issue create service 2016-04-22 08:01:50 +02:00
Grzegorz Bizon 8df63d1513 Update specs to accomodate issuable assign changes 2016-04-22 08:00:57 +02:00
Grzegorz Bizon 4adfd501a5 Verify label affiliation before assigning to issue 
This also verify if milestone belongs to correct project before creating
a new issue.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15439
 2016-04-22 07:59:08 +02:00
Phil HughesandRobert Speicher 50ed43e490 Improved confirmation UX 
Closes #4228
 2016-04-21 20:20:09 -04:00
Robert Speicher aea9799197 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-21 23:13:38 +00:00
Yorick Peterse a4510729a6 Merge branch '15465-fix-sort-by-due-date' into 'master' 
Remove the `.distinct` when finding issues

See merge request !3858
 2016-04-21 22:26:53 +00:00
Yorick Peterse 0e2b644983 Merge branch 'repository-checks-default-off' into 'master' 
Disable 'repository check' feature in 8.7.0

See merge request !3856
 2016-04-21 22:26:34 +00:00
Yorick Peterse d35dde0129 Merge branch 'remove-update-files' into 'master' 
Removed JS update templates

See merge request !3814
 2016-04-21 22:23:41 +00:00
Alfredo Sumaran c9fe9f59d2 Merge remote-tracking branch 'origin/master' into issue_3799 2016-04-21 16:03:33 -05:00
Alfredo Sumaran 80ae3790b4 Update CHANGELOG 2016-04-21 16:03:21 -05:00
Alfredo Sumaran 41cee8c38e Do not display filters if user if there's no current_user 2016-04-21 16:03:14 -05:00
Alfredo Sumaran 3f574c4db9 Use compact syntax 2016-04-21 16:02:00 -05:00
Jacob Schatz fc038916a8 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 21:00:34 +00:00
Robert Speicher 522f2b2caa Merge remote-tracking branch 'dev/master' into 'master' 2016-04-21 16:50:34 -04:00
Robert Speicher 1ea2408ba3 Merge branch 'dev_issue_15331' into 'master' 
Fixes window.opener bug

Adds `noreferrer` value to rel attribute for external links

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

See merge request !1953
 2016-04-21 20:49:41 +00:00
Annabel Dunstone 8277bd7968 Remove float from icon 2016-04-21 15:00:03 -05:00
Achilleas Pipinellis c22c4048ce Merge branch 'doc-updating-gitlab' into 'master' 
Refactor the update documentation



See merge request !3822
 2016-04-21 19:51:57 +00:00
Alfredo Sumaran 72debd840c Fix failing spec 2016-04-21 14:38:44 -05:00
Stan Hu 73fcee95d7 Merge branch 'test-db-migrate' into 'master' 
Add db:migrate:reset task to CI

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

cc @DouweM @stanhu 

See merge request !3788
 2016-04-21 19:01:23 +00:00
Rémy Coutable ad63343417 Merge branch 'instrument-gitlab-access' into 'master' 
Instrument Gitlab::GitAccess/GitAccessWiki



See merge request !3859
 2016-04-21 18:09:41 +00:00
Dmitriy ZaporozhetsandStan Hu ac08a9f1e1 Add db:migrate task to CI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-21 10:52:25 -07:00
Phil Hughes c079ae273c Reverted label link helper 2016-04-21 18:47:16 +01:00
Phil Hughes 97baf41adc Reverted link changes 2016-04-21 18:46:12 +01:00
Rémy Coutable 0ae039d0a1 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce 2016-04-21 19:36:43 +02:00
Rémy Coutable d620d5e160 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2016-04-21 19:34:45 +02:00
Jacob Schatz 6a27a80867 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 17:32:24 +00:00
Robert Speicher 1c7c114e76 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 17:26:13 +00:00
Yorick Peterse c5cb68fd03 Instrument Gitlab::GitAccess/GitAccessWiki 2016-04-21 19:15:32 +02:00
Rémy Coutable 5e37d02d0e Remove the .distinct when finding issues 
This is not needed anymore after !3815.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-21 18:49:08 +02:00
Jacob Schatz 305b8159de Merge branch 'diff-link-fix' into 'master' 
Diff highlight fixes

This fixes a couple of issues with linking/highlight diff lines:

- Fixed issue with lines not being selectable when expanding diff
- Fixed issue with incorrect line being highlighted if line is in discussion view

See merge request !3725
 2016-04-21 16:44:53 +00:00
Robert Speicher 6b4adeb3d1 Fix undefined local variable error in Invalid MR template 
Closes #15408
 2016-04-21 12:38:08 -04:00
Phil Hughes 639ba1b09b Removed console.log 2016-04-21 17:22:16 +01:00