Commit Graph
14237 Commits
Author SHA1 Message Date
Robert Speicher 84d3649d57 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-22 17:38:10 +00:00
Jacob Schatz 7d199b7fcc Merge branch 'escape-label-title' into 'master'
Correctly escapes label title in filters

Fixes #15522

See merge request !3880
2016-04-22 15:56:54 +00:00
Rémy Coutable 951e3459e1 Use the can? helper instead of current_user.can?
Fixes #15513.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-22 15:48:58 +02:00
Phil Hughes 83adcf19b7 Escapes label title in filters
Fixes #15522
2016-04-22 14:32:14 +01:00
Phil Hughes 32be8bd2b1 Fixed issue with assignee object not being returned
Closes #15515
2016-04-22 13:30:58 +01: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
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
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
Grzegorz Bizon 01ab6d704c Use association search in issuable create service 2016-04-22 08:01:50 +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 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 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
Annabel Dunstone 8277bd7968 Remove float from icon 2016-04-21 15:00:03 -05: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
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
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 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 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
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
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
Phil Hughes 7f23e0b8c0 Fixes text color on labels in sidebar 2016-04-21 08:50:15 +01:00
James Lopez 07f8ffbdaf Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/label-filters
# Conflicts:
#	spec/features/issues/filter_by_labels_spec.rb
2016-04-21 08:37:38 +02:00
Alfredo Sumaran fd5b158765 Remove unnecessary provided param 2016-04-21 00:21:28 +00:00
Alfredo Sumaran e38958d1d5 Remove unused param 2016-04-21 00:20:13 +00:00
Arinde EniolaandJacob Schatz 826857f47b disable spellcheck and autocorrect for username field in admin page 2016-04-20 19:27:17 -04:00
Jacob Schatz 7dc16fe6ba Merge branch 'issue_14678' into 'master'
Refresh page according remaining todos

Fixes #14678 

See merge request !3428
2016-04-20 22:26:21 +00:00
Alfredo Sumaran 7e0ef892f4 Merge remote-tracking branch 'origin/master' into label-dropdown-fix 2016-04-20 17:10:10 -05:00
Jacob Schatz 07c5df51eb 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-20 21:12:38 +00:00
Robert Speicher 91c00faee8 Merge branch 'due-date-frontend' into 'master'
Add due date to issues

Closes: #12709

See merge request !3614
2016-04-20 20:43:25 +00:00
Robert Speicher 0f309794e7 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-20 19:52:27 +00:00