Commit Graph
3129 Commits
Author SHA1 Message Date
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
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
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
Rémy Coutable d620d5e160 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2016-04-21 19:34:45 +02: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
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
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
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
Alfredo Sumaran fd5b158765 Remove unnecessary provided param 2016-04-21 00:21:28 +00:00
Mehmet BeydoganandRobert Speicher c6be4ec544 Add red color to overdue and open issues 2016-04-20 15:42:09 -04:00
Mehmet BeydoganandRobert Speicher 3afd08170d Add due_date:time field to Issue model
Add due_date text field to sidebar issue#show
Add ability sorting issues by due date ASC and DESC
Add ability to filtering issues by No Due Date, Any Due Date, Due to tomorrow, Due in this week options
Add handling issue due_date field for MergeRequest
Update CHANGELOG
Fix ambigous match for issues#show sidebar
Fix SCREAMING_SNAKE_CASE offenses for due date contants
Add specs for due date sorting and filtering on issues
2016-04-20 15:42:09 -04:00
Jacob Schatz 9a60887199 Merge branch 'remove-duplicate-ids' into 'master'
Removed duplicate ID's from the HTML



See merge request !3818
2016-04-20 19:11:38 +00:00
Jacob Schatz 56495fd12a 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-20 18:25:27 +00:00
Arinde Eniola 493784da43 fix bug causing the infinite scrolling in activity feeds to break when you click a link and navigate back 2016-04-20 17:47:07 +01:00
Phil Hughes 2dbfa1de27 Put back removed line number 2016-04-20 17:30:21 +01:00
Phil Hughes 6495c13d70 Fixed issue with lines not being selectable when expanding diff 2016-04-20 17:25:16 +01:00
Jacob Schatz f39c647525 Merge branch 'issue_15366' into 'master'
Render relative timestamps for all commits in projects commit list

fixes #15366 

See merge request !3821
2016-04-20 16:08:30 +00:00
Jacob Schatz 1ec203a98f Merge branch 'system-note-commented' into 'master'
Removed commented text from system notes

![Screen_Shot_2016-04-20_at_14.49.22](/uploads/b1617af49cc35595afd6dfcf761a775c/Screen_Shot_2016-04-20_at_14.49.22.png)

See merge request !3836
2016-04-20 14:50:16 +00:00
Phil Hughes 04c992f3cf Removed commented text from system notes 2016-04-20 14:48:53 +01:00
Douwe Maan b016d4356d Also show Revert and Cherry-pick when the source branch can't be removed 2016-04-20 14:28:34 +02:00
Douwe MaanandDouwe Maan d00e5455ee Verify the MR being displayed question has a merge commit set and can be cherry-picked 2016-04-20 14:28:19 +02:00
Rémy Coutable ca3fafb904 Merge branch 'feature/raw-trace-output' into 'master'
Add raw build trace output

Closes #15308, #15147

Changes in the UI:

- on finished build:

    ![raw-on-finished-build](/uploads/0e0904940db5b381ae064d49343c6508/raw-on-finished-build.png)

- on running build:

    ![raw-on-running-build](/uploads/0e4c800b68c12bdd0cbd2eea732b22ff/raw-on-running-build.png)

See merge request !3767
2016-04-20 08:11:50 +00:00
Robert Speicher 3d4875f86a Merge branch 'license-templates-and-api-12804' into 'master'
License templates when creating/editing a LICENSE file

Closes #12804

See merge request !3660
2016-04-20 01:38:49 +00:00
Tomasz Maczukin 81510b46d5 Add feature specs for raw trace 2016-04-19 23:17:50 +02:00
Tomasz Maczukin 27d1349f2b Add raw trace output for GitLab Workhorse 2016-04-19 23:17:49 +02:00
Sytse Sijbrandij 7543bc1776 CLearify shared runner warning. 2016-04-19 21:51:19 +02:00
Evan Lucas d6ab11a1ee 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)
2016-04-19 13:02:08 -05:00
Kamil Trzcinski 27e0c7723c Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline
# Conflicts:
#	db/schema.rb
2016-04-19 14:00:14 -04:00
Douwe Maan 55380e69fc Merge branch 'pmq20/gitlab-ce-issue_12785' 2016-04-19 18:25:42 +02:00
Robert Speicher 7b09bab68e Merge branch 'mr-formatting' into 'master'
use ! rather than # for merge request references

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

See merge request !3740
2016-04-19 16:23:41 +00:00
Felipe Artur f26a6da62c Render relative timestamps for all commits in projects commit list 2016-04-19 12:09:06 -03:00
Phil Hughes c3b5c322b9 Removed duplicate ID's from the HTML 2016-04-19 13:56:59 +01:00
Kamil Trzciński ee812a8707 Merge branch 'configurable-shared-runners-text' into 'master'
Add configurable shared runners text

cc @axil @rspeicher @grzesiek 

See merge request !3750
2016-04-19 12:15:59 +00:00
Kamil Trzcinski d58d88fbd5 Use different markdown 2016-04-19 07:39:53 -04:00
Phil Hughes 136887da4b Removed JS update templates 2016-04-19 10:54:27 +01:00
Dmitriy Zaporozhets 8614ff7584 Allow enable/disable push events for system hooks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-19 11:08:26 +02:00
Ben Bodenmiller b68e3925ff format merge request references properly 2016-04-18 23:32:02 -07:00
Jacob Schatz bf41703fd2 Merge branch 'change_target_branch_link_color' into 'master'
Change the link color of the target branch in a merge rquest

closes #15296

See merge request !3786
2016-04-18 19:02:13 +00:00
Kamil Trzcinski 6b124d42d9 Add configurable shared runners text 2016-04-18 09:54:52 -04:00
Jacob Schatz 5ae4fd2181 Merge branch 'tasklist-fix' into 'master'
Fixed issue with tasklist toggling sidebar refresh

Closes #15270

See merge request !3782
2016-04-18 13:37:27 +00:00
Jacob Schatz d337d27e1c Merge branch 'print-style' into 'master'
Print style

[test.pdf](/uploads/0dab5c1b2d0c4d0cd7e8930e9b660a9f/test.pdf)

Closes #14201

See merge request !3784
2016-04-18 13:29:13 +00:00
Jacob Schatz 4d5d619457 Merge branch 'discussion-notes' into 'master'
Discussion notes update

- At the moment discussion notes are rendered in a list but arent actually a list item and that can cause overflow issues
- Moved the dates to be in the header like other notes
- Fixed overlapping issue on mobile

See merge request !3720
2016-04-18 13:03:24 +00:00
Rémy Coutable 13804aba86 Continue implementation of the license template selector and /licenses API endpoint
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-18 14:47:50 +02:00
Anton DavydovandRémy Coutable 073c3d15c7 Initial implementation if license template selector and /licenses/:key API endpoint 2016-04-18 14:47:50 +02:00
Dmitriy Zaporozhets 2b8fc1387b Merge branch 'edit-last-comment' into 'master'
Scroll to the last comment I made and edit it.

Pressing up in an empty comment box will edit your last comment. 

Also now when you click edit on a comment it will put the cursor at the end.

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

![scrollup](/uploads/b056fdc479d39311f2be412458028a83/scrollup.gif)

See merge request !3757
2016-04-18 11:49:42 +00:00
Arinde Eniola 0592112c6e change the link color of the target branch in a merge rquest 2016-04-18 12:36:15 +01:00
Phil Hughes 1a57601d8c Updated print style
Closes #14201
2016-04-18 12:00:20 +01:00
Phil Hughes c24640c721 Fixed issue with tasklist toggling sidebar refresh
Closes #15270
2016-04-18 11:06:30 +01:00