Commit Graph
3319 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
Grzegorz Bizon d133175b39 User internal pipeline to access project in views 2016-06-01 12:01:49 +02:00
Kamil Trzcinski bc621eef54 Pipelines can be canceled only when there are running builds 2016-05-31 15:26:00 +02: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
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
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
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
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 42879936a8 Hide description on mobile 2016-05-26 09:15:56 +01: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 8bb8dd39d6 Merge branch 'generic-commit-status' into 'master'
Move tags to column in generic_commit_status

Part of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4249    

cc @ayufan 



See merge request !4277
2016-05-25 19:34:27 +00:00
Jacob Schatz 891c94852d Merge branch 'fix-grammar-issues' into 'master'
Fix grammar and wording in text on various pages.

## What does this MR do?

Fixes various grammatical and/or wording issues I found while copyediting on the plane :)

## Why was this MR needed?

Incorrect grammar and weird/confusing wording makes the product look less polished and professional.

See merge request !4237
2016-05-25 19:26:22 +00:00
Connor Shea 77a1565c80 Replace link_to_gfm with link_to in merge request and issue titles.
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 some users, so it’s removed.

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

This is also ever so slightly more performant :)

This fixes #17614 and #17230.
2016-05-24 15:24:11 -06:00
Jacob Schatz d6e5299fb6 Merge branch 'snippets-ui' into 'master'
Updated snippets UI

![Screen_Shot_2016-05-18_at_14.11.54](/uploads/2544351e50f19a36c4ba9a7a92d5544b/Screen_Shot_2016-05-18_at_14.11.54.png)

Closes #14328

See merge request !4194
2016-05-24 21:15:19 +00:00
Jacob Schatz 05323a7855 Merge branch 'project-settings' into 'master'
Project settings UI update

![Screen_Shot_2016-05-16_at_16.42.55](/uploads/2e308cbf26a002fc411c3e84b663a5d1/Screen_Shot_2016-05-16_at_16.42.55.png)![Screen_Shot_2016-05-16_at_16.43.01](/uploads/8d983c43307c65852efe002f6e9482d9/Screen_Shot_2016-05-16_at_16.43.01.png)![Screen_Shot_2016-05-16_at_16.43.16](/uploads/6124e0600cc0e5b309a60b065409d537/Screen_Shot_2016-05-16_at_16.43.16.png)![Screen_Shot_2016-05-16_at_16.43.13](/uploads/177976c2c08034e096e7ebdcad1f369f/Screen_Shot_2016-05-16_at_16.43.13.png)

See merge request !4162
2016-05-24 21:11:30 +00:00
Annabel Dunstone 65925e6998 Remove top block from builds page 2016-05-24 12:31:46 -05:00
Annabel Dunstone 4c058fc429 Remove icons from tables; remove timestamp from pipelines, remove info block at top of pipelines 2016-05-24 12:16:37 -05:00
Connor Shea d1f99bcc1d Resolve some issues Jacob brought up. 2016-05-24 09:04:43 -06:00
Annabel Dunstone d3c5650e17 Move tags to column in generic_commit_status 2016-05-24 08:59:18 -05:00
Kamil Trzcinski 2f252d8f0e Merge branch 'master' into improve-pipeline-design 2016-05-23 21:23:32 -05:00
Dmitriy Zaporozhets 510b5c5f39 Move files tab before commits tab to follow same order as top navigation
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-24 00:41:31 +02:00
Robert Speicher 7001842dc4 Remove issue_to_atom helper 2016-05-23 17:06:26 -04:00
Dmitriy Zaporozhets 2f4dc1ee16 Merge branch 'master' into project-navigation-redesign 2016-05-23 22:41:11 +02:00
Annabel Dunstone e8f869f96b Revert commit info change 2016-05-23 12:04:55 -05:00
Robert Speicher 692f11b05d Render a collection for the Commits atom feed 2016-05-23 12:38:11 -04:00
Robert Speicher 66cebb6f61 Remove event_to_atom helper 2016-05-23 12:37:40 -04:00
Annabel Dunstone 27a5a4e430 Put column headers back 2016-05-23 09:46:06 -05:00
Annabel Dunstone 9c1b3d88db Move build info out of pipeline conditional 2016-05-23 09:30:54 -05:00
Phil Hughes e76d11dce9 Related merge request text alignment 2016-05-23 14:58:48 +01:00
Annabel Dunstone 85031223cd Move tags into column 2016-05-23 08:47:25 -05:00
Connor Shea 1a85f80b78 Fix grammar and wording in text on various pages. 2016-05-22 10:41:30 -06:00
Yorick Peterse 5a02f28a1b Merge branch 'fix-docker-registry-integration' into 'master'
Fix docker registry integration

See merge request !4229
2016-05-21 22:57:39 +00:00
Kamil Trzcinski 8d0332368f Improve status rendering 2016-05-21 09:52:50 -05:00
Kamil Trzcinski 1cbc898223 Improve design of Pipeline view 2016-05-21 01:17:33 -05:00
Jacob Schatz aa060e68ee Merge branch 'dz-fix-fork-counter' into 'master'
Fix fork counter ui bug for safari

## What does this MR do?

Fixes UI bug on safari when fork button has blue arrow

## Screenshots 

![Screenshot_2016-05-19_22.10.21](/uploads/d923d8fc6bc12ee8f7052390bd5d7c51/Screenshot_2016-05-19_22.10.21.png)![Screenshot_2016-05-19_22.09.38](/uploads/130eb8b4a09b2ba5b7c5a83fed543dbf/Screenshot_2016-05-19_22.09.38.png)

See merge request !4221
2016-05-21 03:36:36 +00:00