summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* remove API calls from CE to CIci_closer_integrationValery Sizov2015-09-182-38/+0
|
* Merge branch 'pg_dump_schema' into 'master' Dmitriy Zaporozhets2015-09-181-2/+6
|\ | | | | | | | | | | | | Add pg_schema to backup config https://dev.gitlab.org/gitlab/gitlabhq/issues/2489 See merge request !1345
| * add pg_schema to backup configpg_dump_schemaValery Sizov2015-09-181-2/+6
| |
* | Use 400 to notify that CI API is disabledallow-to-disable-ciKamil Trzcinski2015-09-181-1/+3
| |
* | Allow to disable GitLab CIKamil Trzcinski2015-09-182-0/+8
|/
* Fix: ci projects orderci_projects_orderValery Sizov2015-09-171-0/+21
|
* Merge branch 'restrict-user-api-integers' into 'master'Dmitriy Zaporozhets2015-09-171-1/+1
|\ | | | | | | | | | | | | | | Restrict users API endpoints to use integer IDs Closes #2267 See merge request !1156
| * Restrict users API endpoints to use integer IDsStan Hu2015-08-231-1/+1
| | | | | | | | Closes #2267
* | Merge branch 'fix-nginx' into 'master'Kamil Trzciński2015-09-161-0/+12
|\ \ | | | | | | | | | | | | | | | Add missing proxy requests to migration docs See merge request !1317
| * | Add missing proxy requests to migration docsfix-nginxKamil Trzcinski2015-09-161-0/+12
| | |
* | | Merge branch 'ldap-attributes' into 'master'Robert Speicher2015-09-164-11/+54
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Allow configuration of LDAP attributes GitLab will use for the new user account. Fixes #2412. See merge request !1261
| * | Make code clearerldap-attributesDouwe Maan2015-09-161-11/+9
| | |
| * | Shuffle config around a bitDouwe Maan2015-09-093-15/+9
| | |
| * | Add attributes to LDAP::Config.Douwe Maan2015-09-082-3/+8
| | |
| * | Allow configuration of LDAP attributes GitLab will use for the new user account.Douwe Maan2015-09-083-11/+57
| | |
* | | Fix update_runner_info helperKamil Trzcinski2015-09-161-0/+2
| | |
* | | Fix migrate tags statementKamil Trzcinski2015-09-161-1/+1
| | |
* | | Merge remote-tracking branch 'origin/master' into ↵ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gKamil Trzcinski2015-09-161-1/+1
|\ \ \ | | | | | | | | | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
| * | | Fix broken sort in merge request APIStan Hu2015-09-151-1/+1
| | | | | | | | | | | | | | | | Closes #2266
* | | | Fix migrate taskKamil Trzcinski2015-09-161-1/+1
| | | |
* | | | Added migration docs and updated installation documentationKamil Trzcinski2015-09-161-0/+29
| | | |
* | | | Migrate CI servicesKamil Trzcinski2015-09-161-0/+7
| | | |
* | | | Add rake task for easy migration of SQL dumpsKamil Trzcinski2015-09-163-27/+159
| | | |
* | | | Fix backup testsKamil Trzcinski2015-09-161-1/+1
| | | |
* | | | Fix builds directory storeKamil Trzcinski2015-09-151-4/+8
| | | |
* | | | Use GitLab instead of GITLAB for rake taskKamil Trzcinski2015-09-151-1/+1
| | | |
* | | | Remove unused tasksKamil Trzcinski2015-09-152-20/+0
| | | |
* | | | Cleanup CI backup => migrate with GitLabKamil Trzcinski2015-09-156-346/+51
| | | |
* | | | fix specs. Stage 5Valery Sizov2015-09-151-6/+3
| | | |
* | | | fix specs. Stage 4Valery Sizov2015-09-152-9/+6
| | | |
* | | | fix specs. Stage 3Valery Sizov2015-09-154-50/+57
| | | |
* | | | Add rake task to migrate CI tagsKamil Trzcinski2015-09-151-0/+40
| | | |
* | | | fix specs. Stage 2Valery Sizov2015-09-143-88/+8
| | | |
* | | | rubocop satisfyValery Sizov2015-09-141-18/+18
| | | |
* | | | Fix IOError when fetching a new build by runnerKamil Trzcinski2015-09-141-1/+8
| | | |
* | | | Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' of ↵Valery Sizov2015-09-145-6/+35
|\ \ \ \ | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
| * \ \ \ Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-115-6/+35
| |\ \ \ \ | | |/ / / | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Merge branch 'rs-fix-highlighting' into 'master'Douwe Maan2015-09-111-4/+8
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | RU-BO-COOOOOOOOPrs-fix-highlightingRobert Speicher2015-09-101-1/+1
| | | | | |
| | | * | | Prevent result of SyntaxHighlightFilter being sanitizedRobert Speicher2015-09-101-4/+8
| | | | | |
| | * | | | Add comments and clean up test for !1274Stan Hu2015-09-101-0/+2
| | |/ / /
| | * | | Merge branch 'rescue-syntax-highlighting-errors' into 'master'Robert Schilling2015-09-101-1/+5
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | Gracefully handle errors in syntax highlighting by leaving the block unformattedStan Hu2015-09-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Closes #2433
| | * | | | Added service API endpoint to retrieve service parametersPetheo Bence2015-09-102-0/+19
| | |/ / /
| | * | | Merge branch 'fix-emojis-relative-url' into 'master'Douwe Maan2015-09-091-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | Fix emoji URLs in Markdown when relative_url_root is usedStan Hu2015-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds the ability to run rspecs with relative_url_defined on the enviornment. For example: RELATIVE_URL_ROOT=/gitlab rspec Closes #1728
* | | | | | fix of APIValery Sizov2015-09-141-2/+6
|/ / / / /
* | | | | Remove network from CIDmitriy Zaporozhets2015-09-112-3/+3
| | | | |
* | | | | integration with gitlab authValery Sizov2015-09-091-5/+5
| | | | |
* | | | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-0948-230/+1048
|\ \ \ \ \ | |/ / / /
View Lorry Controller Status