Commit Graph
28056 Commits
Author SHA1 Message Date
James Lopez ae53840723 updated export file for spec 2016-05-11 15:02:55 +02:00
James Lopez 0d83b908b7 Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 2016-05-11 14:55:30 +02:00
James Lopez 27867f3542 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-11 14:52:56 +02:00
James Lopez cffae0d22e fixing more export problems 2016-05-11 14:51:25 +02:00
James Lopez d4ab068e8a Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 2016-05-11 13:23:27 +02:00
James Lopez a86da1b73b Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-11 13:21:34 +02:00
James Lopez 5086e899fe fix log statement 2016-05-11 13:21:00 +02:00
James Lopez 49e6fc40b9 fix bad refactor 2016-05-11 13:17:49 +02:00
James Lopez df6483c65f Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 2016-05-10 17:22:28 +02:00
James Lopez 6fa529e981 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-10 17:18:04 +02:00
James Lopez a5d59f075a added better error handling. Also refactored some of the code and fixed a few issues in project_tree_saver 2016-05-10 17:15:20 +02:00
James Lopez 17ce63a5e1 updated spec export file 2016-05-10 13:11:21 +02:00
James Lopez 278be18cf0 Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 2016-05-10 12:37:33 +02:00
James Lopez e6fcd6d5bd fixed more import merging issues 2016-05-10 12:30:45 +02:00
James Lopez 5b51d13c5e removed method no longer needed 2016-05-10 12:01:10 +02:00
James Lopez d607046df3 fix merge conflicts 2016-05-10 11:56:13 +02:00
James Lopez 6a12ff6345 renaming variable 2016-05-09 18:40:31 +02:00
James Lopez f3a8821217 Merge remote-tracking branch 'gitlab/feature/project-export' into feature/project-export 2016-05-09 18:34:42 +02:00
James Lopez 21be0cae62 fixing merge issues 2016-05-09 18:33:48 +02:00
James Lopez 5dad9f1fcb new line missing 2016-05-09 16:19:07 +00:00
James Lopez bd0c8ce405 fixed space 2016-05-09 18:07:29 +02:00
James Lopez 6fe8b5da1f Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 2016-05-09 18:06:20 +02:00
James Lopez 47cd14b560 Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-09 18:01:06 +02:00
James Lopez 7ff2a51eb2 more refactoring to import export reader 2016-05-09 17:58:43 +02:00
James Lopez 3f87387b6f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export
# Conflicts:
#	app/models/project.rb
2016-05-09 12:19:33 +02:00
James Lopez 9c639041fe bit more refactoring of import export reader, fixed rubocop warning 2016-05-09 12:15:50 +02:00
Dmitriy Zaporozhets 90ae445ba9 Merge branch 'rs-remove-wall_enabled' into 'master'
Remove `wall_enabled` field from Project



See merge request !4089
2016-05-09 10:02:59 +00:00
Yorick Peterse 0a103e983c Merge branch 'improve-multiple-branch-push-performance' into 'master'
Improve multiple branch push performance by memoizing permission checking

See merge request !4091
2016-05-09 09:48:28 +00:00
Rémy Coutable 7d95d3cde7 Merge branch 'trusted-proxies-ip-addr' into 'master'
Pass trusted_proxies to action_dispatch as IPAddrs instead of strings

Without this setting your own trusted_proxies does not work.

Fixes an issue introduce in: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3524

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

See merge request !3970
2016-05-09 09:47:16 +00:00
James Lopez 3aee167dcc fixed issues after refactor, spec passing 2016-05-09 11:10:12 +02:00
Stan Hu 4be77d0b05 Improve multiple branch push performance by memoizing permission checking
If you attempt to push thousands of branches at once, the 60-second timeout
will occur because GitAccess checking does a lot of work to check if the
user has permission to push to a branch. This changes does two things:

1. Instead of making 1 DB query per branch push, use a memoized list of protected branches to check
2. Memoize what permissions the user has to perform on this project

On a test of 10,000 branch pushes, this prevents gitlab-shell from hitting the 60-second
timeout.

Closes #17225
2016-05-09 01:17:14 -07:00
Robert Speicher 4bc4f06512 Merge branch 'escape-commit-titles' into 'master'
Escape HTML in commit titles in system note messages

Closes #17348

See merge request !4084
2016-05-08 23:53:49 +00:00
Stan Hu 4a47470feb Merge branch 'fix-build-notification-on-merge-page-change' into 'master'
Fix build notification on merge request page change even if the build status didn't change

## What does this MR do?
This MR contains a bugfix for #17357 which was introduced by !3998. The notification are now only shown on status changes, and not when switching between different merge requests.

## Are there points in the code the reviewer needs to double check?
Check implementation

## Why was this MR needed?
Because auf a bug introduced in !3998.

## What are the relevant issue numbers?
#17357

Closes #17357

See merge request !4086
2016-05-08 22:07:40 +00:00
Robert Speicher 0e29653f51 Remove wall_enabled field from Project 2016-05-08 15:47:42 -04:00
Benedikt Huss ed2a7a1ec6 Fix build notification on merge request page change even if the build status didn't change 2016-05-08 21:41:09 +02: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 adf9a51899 Escape HTML in commit titles in system note messages
Closes #17348
2016-05-07 08:41:10 -07: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