Commit Graph
2697 Commits
Author SHA1 Message Date
Kamil Trzcinski 269b9224cf Use GitLab instead of GITLAB for rake task 2015-09-15 20:14:22 +02:00
Kamil Trzcinski 7e07bc0698 Remove unused tasks 2015-09-15 20:14:22 +02:00
Kamil Trzcinski ed18e04bb3 Cleanup CI backup => migrate with GitLab 2015-09-15 20:14:21 +02:00
Valery Sizov e2cbb36ba9 fix specs. Stage 5 2015-09-15 15:51:03 +03:00
Valery Sizov 16ba41a186 fix specs. Stage 4 2015-09-15 14:45:59 +03:00
Valery Sizov 22bf844869 fix specs. Stage 3 2015-09-15 13:50:24 +03:00
Kamil Trzcinski 9a3d0f1d92 Add rake task to migrate CI tags 2015-09-15 00:29:20 +02:00
Valery Sizov 910bf96ec3 fix specs. Stage 2 2015-09-14 18:14:17 +03:00
Valery Sizov 4c53cc0eba rubocop satisfy 2015-09-14 14:37:18 +03:00
Kamil Trzcinski 16e44ad7fc Fix IOError when fetching a new build by runner 2015-09-14 11:27:25 +02:00
Valery Sizov 25149ce47e Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' of gitlab.com:gitlab-org/gitlab-ce into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-14 11:16:56 +03:00
Valery Sizov ad5d2c3e78 fix of API 2015-09-14 11:15:54 +03:00
Dmitriy Zaporozhets e3c30bf2e8 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-11 16:32:11 +02:00
Dmitriy Zaporozhets 2ed2ef9210 Remove network from CI 2015-09-11 13:38:37 +02:00
Douwe Maan 4f461fd45f Merge branch 'rs-fix-highlighting' into 'master'
Syntax highlighting improvements

On the server side:

During development I would occasionally see SanitizationFilter sanitizing
the result of SyntaxHighlightFilter, even though its attributes were
whitelisted. This updates the `clean_spans` transformer to return the
whitelisted node as [suggested by the Sanitize docs](http://git.io/vZR8i).

On the client side:

- Makes the syntax_highlight JS more flexible
- Adds JS specs
- Simplifies highlighting of new notes
- Adds highlighting to Markdown preview

See merge request !1278
2015-09-11 08:47:13 +00:00
Stan Hu 267687993a Add comments and clean up test for !1274 2015-09-10 14:24:10 -07:00
Robert Speicher e3c97ede96 RU-BO-COOOOOOOOP 2015-09-10 16:06:24 -04:00
Robert Speicher 7cbf5e4d18 Prevent result of SyntaxHighlightFilter being sanitized 2015-09-10 15:08:06 -04:00
Robert Schilling b8c05a069b Merge branch 'rescue-syntax-highlighting-errors' into 'master'
Gracefully handle errors in syntax highlighting by leaving the block unformatted

A bug in Rouge caused an Exception:

```undefined method `sub' for :Literal:Symbol```

That caused https://gitlab.com/embeddable-common-lisp/ecl/issues/156 to hit Error 500 and fail to display. If a failure occurs, just render the text as preformatted.

Closes #2433

See merge request !1274
2015-09-10 17:45:59 +00:00
Petheo Bence 9bda4b8d88 Added service API endpoint to retrieve service parameters 2015-09-10 18:22:57 +02:00
Stan Hu 9d3344adbb Gracefully handle errors in syntax highlighting by leaving the block unformatted
Closes #2433
2015-09-10 09:16:27 -07:00
Douwe Maan 0d41b2dd87 Merge branch 'fix-emojis-relative-url' into 'master'
Fix emoji URLs in Markdown when relative_url_root is used

Path/URL helpers (e.g. `asset_url_helper`) already include the relative_url_root, so there is no need to attach it twice.

Also adds the ability to run rspecs with relative_url_defined on the enviornment. For example:

RELATIVE_URL_ROOT=/gitlab rspec

Closes #1728

See merge request !1254
2015-09-09 14:53:14 +00:00
Valery Sizov 44261a5d9f integration with gitlab auth 2015-09-09 17:36:01 +03:00
Dmitriy Zaporozhets 0b5d627cd4 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-09 14:56:02 +02:00
Dmitriy Zaporozhets 90c338a495 Move helpers back to original directory 2015-09-09 14:37:34 +02:00
Dmitriy Zaporozhets 5ff84deb3a Merge branch 'nginx-git-http' into 'master'
Do not let NGINX buffer Git HTTP requests

Before this change NGINX would convert a chunked HTTP POST (e.g.
git push) into a HTTP 1.0 single large POST. This creates an
unnecessary delay, and it creates unnecessary memory pressure on
gitlab-git-http-server.

For the response ('proxy_buffering') I am less sure that NGINX 's
buffering behavior is harmful, but it still makes more sense to me
not to interfere with gitlab-git-http-server (and the Golang net/http
server).

See merge request !1256
2015-09-09 09:07:06 +00:00
Jared Szechy e156f42079 FogBugz project import 2015-09-08 20:23:01 -04:00
Jacob Vosmaer 783791fd08 The good stuff needs NGINX 1.7.11 2015-09-07 14:59:32 +02:00
Jacob Vosmaer 8d59b1ac45 Do not let NGINX buffer Git HTTP requests
Before this change NGINX would convert a chunked HTTP POST (e.g.
git push) into a HTTP 1.0 single large POST. This creates an
unnecessary delay, and it creates unnecessary memory pressure on
gitlab-git-http-server.

For the response ('proxy_buffering') I am less sure that NGINX 's
buffering behavior is harmful, but it still makes more sense to me
not to interfere with gitlab-git-http-server (and the Golang net/http
server).
2015-09-07 13:05:29 +02:00
Dmitriy Zaporozhets 14805d6f5c Merge branch 'url-builder-fix-for-relative-urls' into 'master'
Fix URL construction for merge requests, issues, notes, and commits for relative URL config

This MR fixes the constructor of URL links for systems using relative URLs in the application config. The `host` parameter was used improperly, supplying an extra path (e.g. https://mydomain.com/gitlab) and unnecessary scheme. We should be able to default to the URL options set in `8_default_url_options.rb` file.

Closes https://github.com/gitlabhq/gitlabhq/issues/9605

See merge request !1250
2015-09-07 09:57:05 +00:00
Marin Jankovski 8bd419d9c8 Merge branch 'upgrade-redis-required-check' into 'master'
Upgrade Redis requirement check to 2.4.0 per https://github.com/mperham/sidekiq/pull/957

Closes #2222

Closes #2445

See merge request !1251
2015-09-07 07:39:58 +00:00
Stan Hu 8820785c8f Fix emoji URLs in Markdown when relative_url_root is used
Also adds the ability to run rspecs with relative_url_defined on the enviornment. For example:

RELATIVE_URL_ROOT=/gitlab rspec

Closes #1728
2015-09-06 09:46:10 -07:00
Stan Hu fd6eba34eb Use File.join to prevent extra slash in help message from appearing. Before:
```
Try fixing it:
sudo -u git -H /opt/gitlab/embedded/service/gitlab-shell//bin/create-hooks
```
2015-09-06 07:41:23 -07:00
Stan Hu 30039dae63 Upgrade Redis requirement check to 2.4.0 per https://github.com/mperham/sidekiq/pull/957
Closes #2222

Closes #2445
2015-09-06 00:35:16 -07:00
Stan Hu a5314e79f2 Fix URL construction for merge requests, issues, notes, and commits for relative URL config
Closes https://github.com/gitlabhq/gitlabhq/issues/9605
2015-09-04 16:24:01 -07:00
Stan Hu a73044320f Fix rake services:doc generation
[ci skip]
2015-09-03 20:54:16 +00:00
Artem V. NavrotskiyandArtem V. Navrotskiy 8ec59bd18b Add API method for get user by ID of an SSH key 2015-09-03 15:47:22 +03:00
Dmitriy Zaporozhets d9f794a850 Merge branch 'grack-auth-new-instance' into 'master'
Avoid instance variable re-use trouble

This is the quickest/dumbest/safest way I could think of to prevent
the instance variable reuse problems we have on dev.gitlab.org now.

See merge request !1237
2015-09-02 18:05:16 +00:00
Jacob Vosmaer 30bf2b9cc3 Avoid instance variable re-use trouble
This is the quickest/dumbest/safest way I could think of to prevent
the instance variable reuse problems we have on dev.gitlab.org now.
2015-09-02 18:47:56 +02:00
Kirilll Zaitsev 263abda3fd Drone CI service 2015-09-02 05:52:16 +03:00
Marin Jankovski 308c6428ae Merge branch 'use_db_for_application_settings' into 'master'
Check if database connection exists when loading application settings

!1217 broke omnibus-gitlab nightly builds. In omnibus-gitlab we precompile assets without a running database.

See merge request !1230
2015-09-01 21:14:57 +00:00
Douwe Maan afb2e6f485 Merge branch 'rs-cleanup-redcarpet-renderer' into 'master'
Decouple Gitlab::Markdown from the GitlabMarkdownHelper

This module is now the sole source of knowledge for *how* we render
Markdown (and GFM).

See merge request !1223
2015-09-01 20:13:44 +00:00
Douwe Maan 2236e9d617 Merge branch 'fix-bitbucket-import-issue-order' into 'master'
Import all Bitbucket issues and sort issues by creation date

Previously only the first 15 Bitbucket issues would be imported. Other issues in the API return call also calls import errors.

Tested by importing 400+ issues from this repo: https://bitbucket.org/ned/coveragepy

API reference here: https://bitbucket.org/site/master/issues/3571/api-issues-sorting-bb-3518

Closes https://github.com/gitlabhq/gitlabhq/issues/9519

See merge request !1226
2015-09-01 17:29:08 +00:00
Robert Speicher f43e48a1ce Require gitlab/markdown in ReferenceExtractor 2015-09-01 13:28:19 -04:00
Stan Hu 2e9c922dd1 Fix bug where only the first 15 Bitbucket issues would be imported.
Also fix a number of issues where author/reporter names were not available.
2015-09-01 08:50:20 -07:00
Marin Jankovski 3a8773fb2f Added USE_DB env var to allow loading fake settings without db running. 2015-09-01 17:49:16 +02:00
Stan Hu 31e4654b1f Sort issues by creation date in Bitbucket importer
API reference here: https://bitbucket.org/site/master/issues/3571/api-issues-sorting-bb-3518

Closes https://github.com/gitlabhq/gitlabhq/issues/9519
2015-09-01 08:46:42 -07:00
Robert Speicher c104f4d590 Remove unnecessary strip from reference_class method 2015-08-31 16:23:46 -04:00
Robert Speicher 08ca941186 Move REDCARPET_OPTIONS to a private method
There wasn't really a reason to have them as a constant, and we were
getting "already defined" warnings which are always annoying.
2015-08-31 16:22:34 -04:00
Jacob Vosmaer 780bac1026 Be more defensive when running 'kill' 2015-08-31 16:15:41 +02:00