Commit Graph
7631 Commits
Author SHA1 Message Date
Sean McGivern f680eca912 Don't allow merges with new commits
Set a `sha` parameter on the MR form. If this doesn't match the HEAD of
the source branch when the form is submitted, show a warning (like with
a merge conflict) and don't merge the branch.
2016-06-01 20:34:41 +01:00
Dmitriy Zaporozhets 4621531a40 Merge branch 'dz-one-ci-cd-tab' into 'master'
Merge Builds and Pipelines tab into one

Based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4053#note_12064642. Main idea is to keep all CI-related pages under one tab. So we can keep top navigation clean. 

First I tried `CI/CD` naming but it looked weird so I just used Pipelines as tab name. I did not change project settings naming. 

cc @ayufan @markpundsack @jschatz1 

See merge request !4340
2016-06-01 16:53:21 +00:00
Douwe Maan 2d084dd848 Merge branch 'separate-banzai-references' into 'master'
Separate reference gathering from rendering

This is a required step to allow batch processing when gathering references. This in turn would allow grabbing (for example) all mentioned users of an issue/merge request using a single query.

cc @rspeicher @DouweM 

See merge request !3969
2016-06-01 15:51:59 +00:00
Douwe Maan ef6fe42ec0 Merge branch 'fix-cancelable-retryable' into 'master'
Fix cancelability and retriablity of pipeline with generic statuses

Currently it's not possible to cancel or retry generic status since this is external thing to GitLab.

This fixes shown actions of pipelines containing only these actions.


See merge request !4380
2016-06-01 14:21:03 +00:00
Rémy Coutable 4581e71c44 Merge branch 'fix/error-500-in-pipeline-when-fork' into 'master'
Use project that belongs to pipeline in view

## What does this MR do?

This MR makes project in pipelines view match the one that pipeline has been created for.

Closes #17943 

See merge request !4376
2016-06-01 12:37:51 +00:00
Douwe Maan 173d83cae9 Merge branch 'prefer-to_reference' into 'master'
Use `Snippet#to_reference` directly

## What does this MR do?

Instead of hard coding snippet reference, we could just use the existing method for that.

## Why was this MR needed?

To address https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4338#note_12166325 from @DouweM

/cc @jschatz1 

See merge request !4379
2016-06-01 10:57:26 +00:00
Douwe Maan 3416bc53fb Merge branch 'rs-remember-me-2fa' into 'master'
Pass the "Remember me" value to the 2FA token form

Prior, if a user had 2FA enabled and checked the "Remember me" field,
the setting was ignored because the OTP input was on a new form and the
value was never passed.

Closes #18000

See merge request !4369
2016-06-01 10:57:05 +00:00
Grzegorz Bizon d133175b39 User internal pipeline to access project in views 2016-06-01 12:01:49 +02:00
Dmitriy Zaporozhets 8959de25d7 Merge branch 'rs-event-common-has-tooltip' into 'master'
Add tooltips for common Event feed entries

This adds tooltips to the event target for events like "opened merge
request !XYZ"

After https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4090#note_11712839, several references in the event feed had titles but were still missing tooltips.

See merge request !4371
2016-06-01 08:34:29 +00:00
Connor Shea 7f4f959e9b Upgrade Kaminari from 0.16.3 to 0.17.0.
Changelog: https://github.com/amatsuda/kaminari/blob/master/CHANGELOG.rdoc#0170

Deprecates num_pages in favor of total_pages and includes Rails 5 support.
2016-05-31 14:14:16 -06:00
Kamil Trzcinski bc621eef54 Pipelines can be canceled only when there are running builds 2016-05-31 15:26:00 +02:00
Lin Jen-Shin 538b2d687e Use Snippet#to_reference directly 2016-05-31 13:03:30 +00:00
Kamil Trzcinski 846d111f1d Add Application Setting to configure Container Registry token expire delay (default 5min) 2016-05-31 13:23:13 +02:00
Robert Speicher 7c4acf0068 Add tooltips for common Event feed entries
This adds tooltips to the event target for events like "opened merge
request !XYZ"
2016-05-30 23:10:30 -04:00
Robert Speicher a602df3031 Pass the "Remember me" value to the 2FA token form
Prior, if a user had 2FA enabled and checked the "Remember me" field,
the setting was ignored because the OTP input was on a new form and the
value was never passed.

Closes #18000
2016-05-30 22:25:35 -04:00
Gabriel Mazetto ab17e4b74f Small fixes and added to the changelog 2016-05-30 17:41:27 -03:00
Gabriel Mazetto e3311178a3 Add Admin UI to enable Wiki Page events webhook in projects 2016-05-30 16:12:50 -03:00
Dmitriy Zaporozhets 390ea8e0d4 Merge Builds and Pipelines tab into one
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-28 19:26:08 +02:00
Lin Jen-Shin 908ea1b00a Use $ as the snippet prefix so it's consistent 2016-05-28 22:03:30 +08:00
Jacob Schatz 952db59f07 Merge branch 'fix-multiple-ci-status-poll' into 'master'
Fixed potential issue with 2 ci status polling events happening

Possible cause for double notifications was if the request was slow & then you changed page whilst this request was happening it would finish on another page & then launch another interval - this stops that issue.

Also passed in the CI status as an option value rather than waiting for the first ajax request to finish

See merge request !3869
2016-05-27 11:36:01 +00:00
Jacob Schatz 29db3f2c52 Merge branch 'filter-by-any-user' into 'master'
Filter issuables by any user

![any-user](/uploads/c9626b9ac355747344a7073f61dc0c82/any-user.gif)

Closes #2836

See merge request !3820
2016-05-26 22:00:22 +00:00
Robert Speicher 03f26a4091 Merge branch 'remove-unnecessary-titles' into 'master'
Remove header title from project pages

With new navigation design it makes no sense to duplicate title in the header.

See merge request !4304
2016-05-26 20:18:21 +00:00
Jacob Schatz 8f11d35a92 Merge branch 'commit-header-buttons' into 'master'
Reduced number of buttons in commit header

## What does this MR do?

Reduces the buttons in the commit header.

## What are the relevant issue numbers?

Closes #17576

## Screenshots

![Screen_Shot_2016-05-26_at_11.22.24](/uploads/b0d8535bbc02ae367f193dd6633bd022/Screen_Shot_2016-05-26_at_11.22.24.png)

See merge request !4302
2016-05-26 18:49:29 +00:00
Jacob Schatz 1a848d8354 Merge branch 'move-project-dropdown-async' into 'master'
Loads move issue dropdown async

To keep the style of the dropdown the same as the other dropdowns in the issue form, it uses select2 rather than our new dropdowns.

![dropdown](/uploads/e80d5f48440b2a49fd3ac13e74c1ba55/dropdown.gif)

Closes #16563

See merge request !4160
2016-05-26 18:28:01 +00:00
Phil Hughes 6b5c3f09fd Improved mobile styling 2016-05-26 17:15:22 +01:00
Jacob Schatz d4d0fdb479 Merge branch 'services-ui' into 'master'
Updated services UI

![Screen_Shot_2016-05-17_at_10.38.10](/uploads/791ba27b3bbc18c9bde19ecf58ffea21/Screen_Shot_2016-05-17_at_10.38.10.png)

See merge request !4177
2016-05-26 16:10:19 +00:00
Dmitriy Zaporozhets 40a9e39dc7 Return header title for new project page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-26 18:06:11 +02:00
Dmitriy Zaporozhets cdcb354f17 Remove header title from project pages
With new navigation design it makes no sense to duplicate title in the
header

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-26 17:58:44 +02:00
Yorick Peterse 25c08d11bb Added author to various Markdown calls in views
This ensures all these calls have an author set, allowing the use of
"all" mentions where possible.
2016-05-26 17:14:06 +02:00
Josh Frye 85495c8c85 Merge branch 'remove-main-language' into 'master'
Remove main_language and tests. Closes #14937



See merge request !4293
2016-05-26 14:49:25 +00:00
Jacob Schatz 44cc765a8c Merge branch 'link-to-in-issues-index' into 'master'
Replace `link_to_gfm` with `link_to` in merge request and issue titles.

## What does this MR do?
This removed GitLab Markdown Formatting from issue titles due to issues and confusion it caused as well as performance reasons.

On the issue/MR page itself, the formatting is preserved. This only effects index pages. See:

![Screen_Shot_2016-05-24_at_3.31.17_PM](/uploads/8857ed7f3cc6a47ea41ca88134e5d17a/Screen_Shot_2016-05-24_at_3.31.17_PM.png)

I think the trade-off here is worth it, otherwise we'd just be playing wack-a-mole.

## Are there points in the code the reviewer needs to double check?
I don't think so.

## Why was this MR needed?
Previously if an issue had an emoji for its name it would be unclickable. Similarly, links were rendered inline if the title was something like “Fixes a bug with https://google.com”. This confused a number of users, so it’s removed.

This is also ever so slightly more performant :)

## What are the relevant issue numbers?
This fixes #17614 and #17230.

## Screenshots (if relevant)

Before:

![Screen_Shot_2016-05-24_at_3.19.52_PM](/uploads/25313af3d3995a096b7bad7c5a26d071/Screen_Shot_2016-05-24_at_3.19.52_PM.png)

After:

![Screen_Shot_2016-05-24_at_3.20.13_PM](/uploads/f14f09918001bcbac2cd939b016479b2/Screen_Shot_2016-05-24_at_3.20.13_PM.png)

Before:

![Screen_Shot_2016-05-24_at_3.20.48_PM](/uploads/c183ae2c491650c328eb5768f6a55fd9/Screen_Shot_2016-05-24_at_3.20.48_PM.png)

After:

![Screen_Shot_2016-05-24_at_3.20.42_PM](/uploads/d3431a691768bae2c5244b9b632061b9/Screen_Shot_2016-05-24_at_3.20.42_PM.png)

cc: @rspeicher @jschatz1 

See merge request !4284
2016-05-26 14:46:39 +00:00
Phil Hughes 9a7951f7dd Fixed potential issue with 2 ci status polling events happening 2016-05-26 15:24:35 +01:00
Phil Hughes 2830b46cbc Reduced number of buttons in commit header
Closes #17576
2016-05-26 11:19:11 +01:00
Phil Hughes bc0666b3c9 Filter issuables by any user
Closes #2836
2016-05-26 10:04:17 +01:00
Phil Hughes 42879936a8 Hide description on mobile 2016-05-26 09:15:56 +01:00
Jacob Schatz 3d009f7785 Merge branch 'updated-contrib-calendar' into 'master'
POC: Updated contrib calendar

In an effort to cut down the JS file size - i've removed the heatmap calendar used for the contributing calendar on users profiles. We already have d3 on the page so why not use it instead of using a library which uses it?

![Screen_Shot_2016-04-27_at_11.08.41](/uploads/64c40f0c766f800fd0e33ac8be7f9644/Screen_Shot_2016-04-27_at_11.08.41.png)

cc. @jschatz1 

See merge request !3944
2016-05-25 23:29:41 +00:00
Annabel Dunstone 79f890ca85 Add fade out to sub nav 2016-05-25 17:14:28 -05:00
Annabel Dunstone 1965ec6324 Add fade to project nav; fix bug with controls 2016-05-25 17:14:28 -05:00
Annabel Dunstone 3c3402b0ae Add fade out to left side of layout nav; remove dropdown nav helper; remove controls button from mobile 2016-05-25 17:14:28 -05:00
Annabel Dunstone 65a175bbd9 Remove arrows from mobile scroll fade out 2016-05-25 17:14:28 -05:00
Annabel Dunstone 84fee47a76 Start scrolling tabs design 2016-05-25 17:14:28 -05:00
Josh Frye 6d2a0a6b9b Remove main_language and tests 2016-05-25 17:16:42 -04:00
Robert Speicher 3e3463218d New confirmation email 🔥 2016-05-25 16:56:06 -04:00
Robert Speicher 66ae3897e2 Make the standard Devise confirmation email our new plaintext version 2016-05-25 16:56:06 -04:00
Douwe Maan f96127bc2c Merge branch 'rs-remove-issue_to_atom' into 'master'
Remove `issue_to_atom` helper



See merge request !4265
2016-05-25 20:51:53 +00:00
Douwe Maan c1167be283 Merge branch 'improve-pipeline-design' into 'master'
Improve design of Pipeline view

## What does this MR do?

Improves current design of Pipelines view when there is multiple stages.
This makes the statuses clickable and makes the view more compact.

## Screenshots (if relevant)

![Screen_Shot_2016-05-21_at_01.20.40](/uploads/dd031b7af7005c7a61f3165fefa8b7c9/Screen_Shot_2016-05-21_at_01.20.40.png)

cc @DouweM @markpundsack @rspeicher @marin 

See merge request !4230
2016-05-25 20:50:26 +00:00
Douwe Maan fb11004d5e Merge branch 'rs-event-atom-partial' into 'master'
Remove `event_to_atom` helper



See merge request !4234
2016-05-25 20:49:26 +00:00
Jacob Schatz 49343f9a31 Merge branch 'closed-by-alignment' into 'master'
Related merge request text alignment

Fixed the alignment of the text 'When this merge request is accepted...' on issues page

![Screen_Shot_2016-05-23_at_14.59.48](/uploads/5d2f4be94108364a9d004169a6825a9e/Screen_Shot_2016-05-23_at_14.59.48.png)

See merge request !4251
2016-05-25 20:25:10 +00:00
Jacob Schatz 0cc060bc5f Merge branch 'issue-filter-name-options' into 'master'
Issuable filtering improvements

This improves the filtering of issues and merge requests by creating a single file that encapsulates all the filtering. Previously this was done with a file for issues and a file for merge requests.

Created the ability for the text search to be done alongside other filterables. Previously because this was outside the filterable form, this wasn't possible and would instead do either filter dropdown or text filter - not both. Fixes #4252 

Fixed issue with not being able to filter and sort issues without refreshing the page. Fixes #15269 

See merge request !3699
2016-05-25 19:44:06 +00:00
Jacob Schatz b21e234b11 Merge branch 'gitlab-import-status' into 'master'
Fixed issue with GitLab import buttons having a spinner

![import](/uploads/db635f1d62affefca027d5fd4f545cd1/import.gif)

Closes #17232

See merge request !4276
2016-05-25 19:40:17 +00:00