Commit Graph
27387 Commits
Author SHA1 Message Date
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
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
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
Jacob Schatz a216ea5a34 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-21 16:22:15 +00:00
Jacob Schatz d2bf73b776 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 15:53:58 +00:00
Jacob Schatz cd19ce8b05 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 15:52:45 +00:00
Stan Hu ffef71d99b Merge branch 'sidekiq-memory-sigterm' into 'master'
Use SIGTERM during Sidekiq memory shutdown

This makes the memory killer behave more like 'sidekiqctl stop'.

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

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

See merge request !3853
2016-04-21 15:28:47 +00:00
Jacob Vosmaer b80bf57d37 Disable 'repository check' feature in 8.7.0
It still causes too many false alarms.
2016-04-21 16:50:26 +02:00
Annabel Dunstone 1641e81971 File name change appears on one line 2016-04-21 09:14:54 -05:00
Douwe Maan 7ded28ff99 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 13:13:10 +00:00
Jacob Vosmaer 103c405339 Use SIGTERM during Sidekiq memory shutdown
This makes the memory killer behave more like 'sidekiqctl stop'.
2016-04-21 14:49:15 +02:00
Jacob Schatz 53534682a3 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:15:20 +00:00
Dmitriy Zaporozhets f4859b93a5 Merge branch 'top-navigation-concept' into 'master'
Implement top navigation for profile area

Main idea is to keep left sidebar static so user is not confused by
changing context. Instead we put changing navigation with changing
content in one main block. I used profile area as a simplest way to 
implement and test this concept. Your feedback is welcome in comments

For https://gitlab.com/gitlab-org/gitlab-ce/issues/14354#note_4878536


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

See merge request !3824
2016-04-21 11:48:28 +00:00
Jacob Schatz 6211a8a8c0 Revert changelog too 2016-04-21 07:36:46 -04:00
Jacob Schatz b3f4e8b218 Revert "Merge branch 'sentry-js' into 'master' "
This reverts commit 0f309794e7, reversing
changes made to 1e596fef1c.
2016-04-21 07:27:27 -04:00
James Lopez b09b175def refactored specs based on feedback 2016-04-21 13:20:00 +02:00
Douwe Maan 7f3a22a7b3 Merge branch 'document-feature-freeze' into 'master'
Document the feature freeze starting on the 18th

cc @dzaporozhets @rspeicher @DouweM @rymai @axil 

See merge request !3698
2016-04-21 10:56:07 +00:00
Rémy Coutable 338f6f0902 Merge branch 'issue_5838' into 'master'
Show project members only for members

fixes #5838 

See merge request !3752
2016-04-21 10:31:20 +00:00
Achilleas Pipinellis 67c990be65 Split into sections, port downgrade_ee_to_ce doc from EE
[ci skip]
2016-04-21 13:07:33 +03:00
Phil Hughes 15d1804d9f Updated tests 2016-04-21 10:54:03 +01:00
Yorick Peterse a5ed44fd71 Merge branch 'add-pg-trgrm-in-migration' into 'master'
Attempt to create pg_trgm extension in migration for test/dev environments

See merge request !3805
2016-04-21 09:10:45 +00:00
James Lopez 2d2b73ae49 use wait_for_ajax instead of sleeping for 2 days! 2016-04-21 10:30:48 +02:00
Grzegorz Bizon 677718fd02 Merge branch 'fix/cross-project-labels-project-reference' into 'master'
Fix cross-project label ref used with invalid project

When cross-project label reference was used with invalid project reference, `nil` was assigned to project variable which later caused an exception.

Closes #15168

See merge request !3811
2016-04-21 08:13:12 +00:00
Kamil Trzciński 140eba0cfa Merge branch 'addtap' into 'master'
add tap coverage example to project settings

Previously, there were examples for Simplecov, pytest-cov, and phpunit.
This adds an example for using the tap cli tool
(https://github.com/tapjs/node-tap)

Before:
![Screen_Shot_2016-04-07_at_9.57.32_AM](/uploads/2864d4cd4b5288565057263a435a851f/Screen_Shot_2016-04-07_at_9.57.32_AM.png)

After:

![Screen_Shot_2016-04-07_at_9.57.16_AM](/uploads/62901e01c4ad6db86e4ced3dfebd20b9/Screen_Shot_2016-04-07_at_9.57.16_AM.png)


See merge request !3597
2016-04-21 08:13:04 +00:00
Kamil Trzciński d240666800 Merge branch 'ci-commit-as-pipeline' into 'master'
Ci::Commit becomes a Pipeline object

1. Ci::Commit receives context: ref, :tag.
1. One Ci::Commit describes a one Pipeline
1. Pipeline is created from `.gitlab-ci.yml`
1. Pipeline is a ordered group of builds
1. We test MR against Pipeline
1. Pipelines have a separate view (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703)
1. Pipeline can be triggered from UI (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703)
1. Later we change `Trigger -> TriggerRequest -> Build` to `Trigger -> Pipeline` (future)
1. We add a Pipeline Hook that will be triggered on Pipeline status change  (future)
1. We extend notifications to use `Pipeline Hook` to send summary on pipeline changes (future)

After merging that I'll prepare a separate MR that will unify naming, database columns, table names:
```
Ci::Commit -> Pipeline
Ci::Build -> Build
CommitStatus -> Job
GenericCommitStatus -> ExternalJob

ci_commits -> pipelines
ci_builds -> jobs
```

This MR implements first 5 points.

This is made to solve this issue https://gitlab.com/gitlab-org/gitlab-ce/issues/14149.

See merge request !3653
2016-04-21 08:10:37 +00:00
Phil Hughes 2e0182b278 Fixed issue with author link color on dark diffs 2016-04-21 08:54:24 +01:00