Commit Graph
27878 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
Achilleas Pipinellis 4450182015 Merge branch 'docs/adapt-user-api' into 'master'
docs(api): adapted user API documentation to match with latest API

The user API documentation and the actual implementation were out of sync, missing certain newly introduced fields and beeing inconsistent between certain API definitions. The documentation was changed according the actual latest implementation.

Signed-off-by: Fabio Huser <fabio@fh1.ch>

See merge request !4067
2016-05-08 19:34:16 +00:00
Achilleas Pipinellis 429f537035 Merge branch 'patch-3' into 'master'
blost -> blog



See merge request !4063
2016-05-08 18:46:48 +00:00
Achilleas Pipinellis b1837eef4b Merge branch 'update-doc-ci-examples' into 'master'
Update CI example docs.

Docs for CI examples are updated as follows:

- Fix a dead link from CI example top to `dpl`
- Specify Django for a Python project, not Rails
- Use the latest Python Docker image as [Heroku supports only Python 3.5.1 (and 2.7.11)](https://devcenter.heroku.com/articles/python-support)
- Show the latest Docker Hub URL links.

See merge request !4082
2016-05-08 10:26:46 +00:00
Achilleas Pipinellis c8ce50cc2c Merge branch 'update-docker-hub-link' into 'master'
Update Docker Hub and Engine links

1. Update all links to Docker Hub.
2. Update or rename Docker with Docker Engine.

See merge request !4083
2016-05-08 10:21:37 +00:00
Dmitriy Zaporozhets e1ee5871cf Merge branch 'hiring' into 'master'
We're hiring.

Help with recruiting, saw it in other readme's too.

See merge request !4080
2016-05-08 09:40:41 +00: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 f3578baa83 Merge branch 'reduce-delete-delay' into 'master'
Reduce delay in destroying a project from 1-minute to immediately

This 1-minute delay was causing confusion among customers. Was there a reason this needed to be 1 minute?


See merge request !3997
2016-05-07 08:55:13 +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
Takuya Noguchi 3c8265559a Rename Docker with Docker Engine. 2016-05-07 14:54:36 +09:00
Takuya Noguchi 9522131259 Update Docker Hub links. 2016-05-07 13:29:24 +09:00
Takuya Noguchi dd4fe8e9bb Update CI example docs. 2016-05-07 13:15:04 +09:00
Dmitriy Zaporozhets 2e1162272e Merge branch 'dz-improve-group-settings' into 'master'
Make group settings button white instead of gray for better visibility

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

cc @annabeldunstone @skyruler 

See merge request !4078
2016-05-06 19:55:45 +00:00
Sytse Sijbrandij f4bde77529 We're hiring. 2016-05-06 21:52:29 +02: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
Robert Speicher dd890d7ef3 Merge branch 'annotate-models' into 'master'
Annotate models

See merge request !4071
2016-05-06 15:24:35 +00:00
Robert Speicher 70b065aa44 Merge branch 'update-db-schema' into 'master'
Update db/schema.rb after running db:migrate:reset

See merge request !4074
2016-05-06 15:24:06 +00:00
Dmitriy Zaporozhets 235d70da73 Update db/schema.rb after running db:migrate:reset
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-06 16:33:23 +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
Sean McGivern 13d4d3c8b0 Add specs for MergeRequests::BuildService 2016-05-06 12:24:36 +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 0a38eac16e Update CHANGELOG 2016-05-06 20:03:50 +09:00
Takuya Noguchi 4ab49fab94 Use outer join for issues ordering by milestones due. 2016-05-06 19:57:26 +09:00
Fabio HuserandFabio Huser 76f43d5ce2 docs(api): adapted user API documentation to match with latest API
The user API documentation and the actual implementation were out of sync, missing certain newly introduced fields and beeing inconsistent between certain API definitions. The documentation was changed according the actual latest implementation.

Signed-off-by: Fabio Huser <fabio@fh1.ch>
2016-05-06 11:50:51 +02: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
Achilleas Pipinellis 622a33e98e Merge branch 'available-memory-req' into 'master'
Add note to requirements doc on swap recommendation, and ensuring enough available memory.

Called out as a result of 2GB RAM DO droplets not being enough to run backups on without adding a swap file. See: https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1267

cc\ @stanhu @axil 

See merge request !4060
2016-05-06 09:03:58 +00:00
Stan Hu 1070e0a841 Merge branch 'patch-4' into 'master'
clarify changelog entry on GitHub Enterprise import support

/cc @stanhu 

See merge request !4066
2016-05-06 08:08:24 +00:00
Ben Bodenmiller b8b54252fd clarify changelog entry on GitHub Enterprise import support 2016-05-06 07:54:00 +00:00
Zeger-Jan van de Weg 8278b763d9 Auto annotate models on migration
[ci skip]
2016-05-06 09:07:35 +02:00
Zeger-Jan van de Weg 47da013cf8 Annotate the models 2016-05-06 08:27:46 +02:00
Robert Speicher 00acdcf78f Merge branch 'cascade_drop' into 'master'
Rake drop tables with cascade

See merge request !4020
2016-05-06 01:54:13 +00:00
Ben Bodenmiller 80b30500e4 blost -> blog 2016-05-06 00:42:13 +00:00
Robert Speicher 4fce876542 Merge branch 'fix/import-url-issues' into 'master'
Fix importer bug when throwing exceptions

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

See merge request !3941
2016-05-05 22:27:40 +00:00
Robert Speicher 9864b2dbc5 Merge branch 'rs-each-arg' into 'master'
Add a note to testing docs about the `:each` argument to RSpec hooks

[ci skip]

See merge request !4061
2016-05-05 21:36:58 +00:00
Robert Speicher df9a7c6b4a Add a note to testing docs about the :each argument to RSpec hooks
[ci skip]
2016-05-05 17:22:18 -04:00
DJ Mountney d6f67dba01 Add note to requirements doc on swap recommendation, and ensuring enough available memory. 2016-05-05 13:46:58 -07:00
Robert Speicher 56c49f4fb5 Merge branch 'tag-exists' into 'master'
Use tag_exists? in GitAccess#protected_tag?

This will fail until https://gitlab.com/gitlab-org/gitlab_git/merge_requests/81/ is merged. Adding this should speed up checking for tags in `Gitlab::GitAccess` as it no longer needs to retrieve the entire list of tags.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/14280 for more information.

See merge request !3983
2016-05-05 18:35:24 +00:00
Annabel Dunstone 00b3eedf7c Remove duplicate cover-control mobile styles 2016-05-05 12:55:01 -05:00