Commit Graph
14467 Commits
Author SHA1 Message Date
Kamil Trzcinski baef6728fa Send trace to a browser incrementally when build is running
We send a state of ansi2html to client, client needs to send this state back.
The state describes the configuration of generator and position within trace.
2016-05-09 19:59:45 +03:00
Robert Speicher 4a844b73ff Merge branch 'fix-sanitize-svg' into 'master'
Update SVG sanitizer to conform to SVG 1.1

Original SVG sanitizer would strip out necessary elements and attributes.

Use a custom Loofah scrubber since sanitize 2.x transformers are inadequate to handle case-sensitive SVG attributes since they parse documents as HTML instead of XML, which causes all SVG attribute names (e.g. `viewBox`) to be downcased.

* SVG element list: https://www.w3.org/TR/SVG/eltindex.html
* SVG attribute list: https://www.w3.org/TR/SVG/attindex.html

Closes #14555

See merge request !3401
2016-05-07 19:08:46 +00:00
Stan Hu a65de9c2c1 Reduce delay in destroying a project from 1-minute to immediately
Run ProjectDestroyWorker after pending_delete attribute has been committed to DB
2016-05-07 01:12:31 -07:00
Stan Hu 21d89d0286 Update SVG sanitizer to conform to SVG 1.1
Use a custom Loofah scrubber since sanitize 2.x transformers are inadequate
to handle case-sensitive SVG attributes. sanitize parses documents as HTML
instead of XML, which causes all SVG attribute names (e.g. viewBox) to be downcased.

* SVG element list: https://www.w3.org/TR/SVG/eltindex.html
* SVG attribute list: https://www.w3.org/TR/SVG/attindex.html

Closes #14555
2016-05-06 23:20:24 -07:00
Dmitriy Zaporozhets dd03cfd136 Make group settings button white instead of gray for better visibility
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-06 21:05:57 +02:00
Dmitriy Zaporozhets ecd7c1d25a Merge branch 'nice-todos-bell' into 'master'
Add nice new Todo bell

![H5bp___Html5_Boilerplate___GitLab](/uploads/e8725396a5d77a8db09742f977595605/H5bp___Html5_Boilerplate___GitLab.png)

![H5bp___Html5_Boilerplate___GitLab](/uploads/011a21ee1653502c4f78543e28d97b67/H5bp___Html5_Boilerplate___GitLab.png)

![H5bp___Html5_Boilerplate___GitLab](/uploads/0858cb9621463ef6a32237fcb0b4f63d/H5bp___Html5_Boilerplate___GitLab.png)

Fixes: #15671 

See merge request !4077
2016-05-06 16:37:40 +00:00
Dmitriy Zaporozhets 27ae068450 Merge branch 'dz-refactor-group-subnav' into 'master'
Move group settings navigation to own partial

A bit of refactoring for !3980

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

See merge request !4076
2016-05-06 16:25:42 +00:00
Jacob Schatz 50b89cd9bf Merge branch '17343-a-tag-code' into 'master'
Align code within links in comments

Closes #17343

<img src="/uploads/78e03c1dc0e99c7bdb686d9d120a4525/Screen_Shot_2016-05-06_at_9.28.26_AM.png" width="800px">

See merge request !4073
2016-05-06 16:08:45 +00:00
Jacob Schatz 510b10583c Add nice new Todo bell 2016-05-06 11:47:43 -04:00
Dmitriy Zaporozhets 64ef2e0834 Move group settings navigation to own partial
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-06 17:33:32 +02:00
Annabel Dunstone 0aba37cfd1 Align code within links in comments 2016-05-06 09:21:04 -05:00
Dmitriy Zaporozhets 2dcd3f29dd Annotate models
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-06 16:13:35 +02:00
Dmitriy Zaporozhets b1230bbda6 Merge branch 'group-navigation-redesign' into 'master'
Redesign navigation for group pages

Part of #14838. This MR targets on desktop version. Mobile version improvements will be in separate merge request 

See merge request !3980
2016-05-06 14:06:02 +00:00
Douwe Maan 0cdd4f310f Merge branch '14564-mr-automatic-title' into 'master'
Auto-set title for branches created from issues

This sets the title for a new MR to 'Resolves "$issue-title"' when:
- The source branch for the MR begins with a value iid.
- The MR has more than one commit in its diff (if there's one commit, keep using the commit's first line).
- The iid does not point to a confidential issue.

Single commit:

![A single commit uses the commit title](/uploads/cd34f59cd67f095c3034fae07950f8b5/image.png)

Multiple commits:

![Multiple commits use the issue title](/uploads/a322c406ddd56913c5aebd88d16e5a5e/image.png)

Confidential issue:

![A confidential issue uses the branch name](/uploads/7ae9b79de5f6101ced46802f3c3a6e71/image.png)

cc @DouweM @zj 

Closes #14564

See merge request !3966
2016-05-06 12:14:13 +00:00
Grzegorz Bizon e65b78c6f1 Merge branch 'remove-unexpected-filtering' into 'master'
Use outer join for issues ordering by milestones due.

This MR contains an implementation for Solution 1 suggested in #14183 

Ordering by Milestone due sooner/later ("milestone sort") filters issues without a milestone, which can let users feel like disappearing issues without a milestone.

See merge request !3872
2016-05-06 11:48:03 +00:00
Sean McGivern 09209725ce Don't auto-set MR title for confidential issues 2016-05-06 12:24:37 +01:00
Sean McGivern e76f339dcd Auto-set title for branches created from issues
If a branch starts with an issue's IID, followed by a hyphen, the
description will be updated to say that is closes the issue. This also
updates the title of the merge request to 'Resolves "$issue-title"', as
long as:
- There is more than one commit in the merge request (if there is only
  one commit, the commit's title will be used as before)
- The issue's IID is valid for the project
2016-05-06 12:24:37 +01:00
Douwe Maan 45ef8d5eda Merge branch 'annotate-models' into 'master'
Update annotations on models



See merge request !3962
2016-05-06 11:15:04 +00:00
Takuya Noguchi 4ab49fab94 Use outer join for issues ordering by milestones due. 2016-05-06 19:57:26 +09:00
Douwe Maan aa18cc205c Merge branch 'issue_14532_assign_labels_milestone_when_moving_issue' into 'master'
Assign labels milestone when moving issue

Closes #14532.

See merge request !3934
2016-05-06 09:15:40 +00:00
Zeger-Jan van de Weg 47da013cf8 Annotate the models 2016-05-06 08:27:46 +02:00
Annabel Dunstone 00b3eedf7c Remove duplicate cover-control mobile styles 2016-05-05 12:55:01 -05:00
Dmitriy Zaporozhets 5a8b8ba6c7 Fix group settings dropdown for group members and visitors
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-05 16:37:41 +02:00
Dmitriy Zaporozhets 4bef939e27 Remove group rss icon since it depends on context and duplciates on other pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-05 16:31:19 +02:00
Annabel Dunstone c24958365f Remove mobile styles; horizontally scroll layout nav links 2016-05-05 09:00:29 -05:00
Jacob Schatz 0bdb68ef60 Merge branch '15179-builds-redesign' into 'master'
15179 builds page redesign

Closes #15179   

<img src="/uploads/d9ec515e500dc9023d588b5c38636a86/Screen_Shot_2016-04-26_at_1.35.11_PM.png" width="800px">

Updated screenshot:   
<img src="/uploads/63109057ee271d788ab726e52acf9328/Screen_Shot_2016-05-04_at_9.23.01_AM.png" width="800px">

Updated screenshot with count badges instead of parentheses:  
<img src="/uploads/d9cd91b079d23c63601c8dbcf4803c8d/Screen_Shot_2016-05-05_at_7.40.48_AM.png" width="800px">

See merge request !3935
2016-05-05 13:39:28 +00:00
Dmitriy Zaporozhets 3592a59715 Merge branch 'master' into group-navigation-redesign 2016-05-05 11:44:03 +02:00
Long Nguyen e016cdb73e Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_14532_assign_labels_milestone_when_moving_issue 2016-05-05 15:02:46 +07:00
Long Nguyen 91f693c0c4 Update changelog, improve specs 2016-05-05 13:59:09 +07:00
Stan Hu f5ae92d81c Merge branch 'log-impersonation-events' into 'master'
Log to application.log when an admin starts and stops impersonating a user

Closes gitlab-org/gitlab-ee#536

See merge request !4028
2016-05-05 04:08:45 +00:00
Stan Hu bee002270d Merge branch 'fix-team-build-state-in-mr-widget' into 'master'
Merge request widget displays TeamCity build state and code coverage correctly again

## What does this MR do?
This MR contains a fix for a regression introduced in `8.7`. In former version, the TeamCity build status was always displayed correctly. In `8.7` the build state is still checked, but the UI is not updated correctly any longer.

## Are there points in the code the reviewer needs to double check?
The changes are quite simple, so please simply double check them.

## Why was this MR needed?
This MR is needed to make the TeamCity build status working again.

## What are the relevant issue numbers?
#17080 

See merge request !3998
2016-05-04 23:47:36 +00:00
Stan Hu 5653a71635 Merge branch 'rs-repository-size-format' into 'master'
Use `number_to_human_size` helper to show repository size

This will intelligently format large repository sizes in GBs (or,
shudder, TBs).

Also, removes `rescue` clause from `repository_size` helper.
The repository size has since become calculated (and cached)
more intelligently, and this should no longer be necessary.

See merge request !4047
2016-05-04 22:54:25 +00:00
Benedikt Huss 0e9c2e721b Feedback from stanhu 2016-05-05 00:18:36 +02:00
Robert Speicher 5448970950 Remove rescue clause from repository_size helper
The repository size has since become calculated (and cached) more
intelligently, and this should no longer be necessary.
2016-05-04 18:14:03 -04:00
Robert Speicher 92c25f4200 Use number_to_human_size helper to show repository size
This will intelligently format large repository sizes in GBs (or,
shudder, TBs).
2016-05-04 18:13:33 -04:00
Benedikt Huss 655b2640ae Merge request widget displays TeamCity build state and code coverage correctly again 2016-05-05 00:07:56 +02:00
Annabel Dunstone 8d19955c05 Revert counter parentheses back to badges 2016-05-04 17:07:47 -05:00
Robert Speicher 915a4193b4 Merge branch 'sanitize-new-project-error-message' into 'master'
Sanitize repo paths in new project error message

Closes #17243

See merge request !4029
2016-05-04 22:03:18 +00:00
Annabel Dunstone 3a3f0bf436 Change build icons into buttons; update tests 2016-05-04 16:45:37 -05:00
Annabel Dunstone fc20639c8d Builds page redesign 2016-05-04 16:45:37 -05:00
Annabel Dunstone 7878eb9fa6 Start builds redesign 2016-05-04 16:45:37 -05:00
Stan Hu 75523d1df9 Sanitize repo paths in new project error message
Closes #17243
2016-05-04 14:06:07 -07:00
Jacob Schatz 950ab1e847 Merge branch '17000-comment-links' into 'master'
Remove break-all from links

Closes #17000

See merge request !4042
2016-05-04 20:59:27 +00:00
Jacob Schatz 7ed3a6944f Merge branch 'fix-files-page-colors' into 'master'
Fix file list page border colors



See merge request !4008
2016-05-04 20:57:38 +00:00
Jacob Schatz 2b4e8d933c Merge branch 'improve-milestone-ui' into 'master'
Improve milestone page UI

* remove button after edit button
* use hex value for text color
* re-use existing text color variables

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

See merge request !4014
2016-05-04 20:56:13 +00:00
Annabel Dunstone ccd9c4be00 Reduce height of nav to 50px 2016-05-04 15:50:30 -05:00
Yorick Peterse fad7b392dc Merge branch 'invalid-exists-on-new-push' into 'master'
Expire repository exists? and has_visible_content? caches after a push if necessary

See merge request !3975
2016-05-04 20:31:11 +00:00
Annabel Dunstone 6b4e255aa8 Remove break-all from links 2016-05-04 15:00:33 -05:00
Stan Hu 525e05b653 Expire repository exists? and has_visible_content? caches after a push if necessary
Closes #17012
2016-05-04 11:59:12 -07:00
Jacob Schatz 8be1118aa5 Merge branch 'clean-user-profile-classes' into 'master'
Remove unused .contributed-projects class

While working on #13401 and trying to add a new tab to the user profile
page, I came across this. I noticed that the `contributed-projects`
class was only being used in order to select the div in the tests. For
consistency with the other tabs, I decided to remove this class and use
the div's id for the selector.

See merge request !3945
2016-05-04 18:34:34 +00:00