Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove API calls from CE to CIci_closer_integration | Valery Sizov | 2015-09-18 | 2 | -38/+0 |
| | |||||
* | Merge branch 'pg_dump_schema' into 'master' | Dmitriy Zaporozhets | 2015-09-18 | 1 | -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_schema | Valery Sizov | 2015-09-18 | 1 | -2/+6 |
| | | |||||
* | | Use 400 to notify that CI API is disabledallow-to-disable-ci | Kamil Trzcinski | 2015-09-18 | 1 | -1/+3 |
| | | |||||
* | | Allow to disable GitLab CI | Kamil Trzcinski | 2015-09-18 | 2 | -0/+8 |
|/ | |||||
* | Fix: ci projects orderci_projects_order | Valery Sizov | 2015-09-17 | 1 | -0/+21 |
| | |||||
* | Merge branch 'restrict-user-api-integers' into 'master' | Dmitriy Zaporozhets | 2015-09-17 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | Restrict users API endpoints to use integer IDs Closes #2267 See merge request !1156 | ||||
| * | Restrict users API endpoints to use integer IDs | Stan Hu | 2015-08-23 | 1 | -1/+1 |
| | | | | | | | | Closes #2267 | ||||
* | | Merge branch 'fix-nginx' into 'master' | Kamil Trzciński | 2015-09-16 | 1 | -0/+12 |
|\ \ | | | | | | | | | | | | | | | | Add missing proxy requests to migration docs See merge request !1317 | ||||
| * | | Add missing proxy requests to migration docsfix-nginx | Kamil Trzcinski | 2015-09-16 | 1 | -0/+12 |
| | | | |||||
* | | | Merge branch 'ldap-attributes' into 'master' | Robert Speicher | 2015-09-16 | 4 | -11/+54 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | Allow configuration of LDAP attributes GitLab will use for the new user account. Fixes #2412. See merge request !1261 | ||||
| * | | Make code clearerldap-attributes | Douwe Maan | 2015-09-16 | 1 | -11/+9 |
| | | | |||||
| * | | Shuffle config around a bit | Douwe Maan | 2015-09-09 | 3 | -15/+9 |
| | | | |||||
| * | | Add attributes to LDAP::Config. | Douwe Maan | 2015-09-08 | 2 | -3/+8 |
| | | | |||||
| * | | Allow configuration of LDAP attributes GitLab will use for the new user account. | Douwe Maan | 2015-09-08 | 3 | -11/+57 |
| | | | |||||
* | | | Fix update_runner_info helper | Kamil Trzcinski | 2015-09-16 | 1 | -0/+2 |
| | | | |||||
* | | | Fix migrate tags statement | Kamil Trzcinski | 2015-09-16 | 1 | -1/+1 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into ↵ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | Kamil Trzcinski | 2015-09-16 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | ||||
| * | | | Fix broken sort in merge request API | Stan Hu | 2015-09-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Closes #2266 | ||||
* | | | | Fix migrate task | Kamil Trzcinski | 2015-09-16 | 1 | -1/+1 |
| | | | | |||||
* | | | | Added migration docs and updated installation documentation | Kamil Trzcinski | 2015-09-16 | 1 | -0/+29 |
| | | | | |||||
* | | | | Migrate CI services | Kamil Trzcinski | 2015-09-16 | 1 | -0/+7 |
| | | | | |||||
* | | | | Add rake task for easy migration of SQL dumps | Kamil Trzcinski | 2015-09-16 | 3 | -27/+159 |
| | | | | |||||
* | | | | Fix backup tests | Kamil Trzcinski | 2015-09-16 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix builds directory store | Kamil Trzcinski | 2015-09-15 | 1 | -4/+8 |
| | | | | |||||
* | | | | Use GitLab instead of GITLAB for rake task | Kamil Trzcinski | 2015-09-15 | 1 | -1/+1 |
| | | | | |||||
* | | | | Remove unused tasks | Kamil Trzcinski | 2015-09-15 | 2 | -20/+0 |
| | | | | |||||
* | | | | Cleanup CI backup => migrate with GitLab | Kamil Trzcinski | 2015-09-15 | 6 | -346/+51 |
| | | | | |||||
* | | | | fix specs. Stage 5 | Valery Sizov | 2015-09-15 | 1 | -6/+3 |
| | | | | |||||
* | | | | fix specs. Stage 4 | Valery Sizov | 2015-09-15 | 2 | -9/+6 |
| | | | | |||||
* | | | | fix specs. Stage 3 | Valery Sizov | 2015-09-15 | 4 | -50/+57 |
| | | | | |||||
* | | | | Add rake task to migrate CI tags | Kamil Trzcinski | 2015-09-15 | 1 | -0/+40 |
| | | | | |||||
* | | | | fix specs. Stage 2 | Valery Sizov | 2015-09-14 | 3 | -88/+8 |
| | | | | |||||
* | | | | rubocop satisfy | Valery Sizov | 2015-09-14 | 1 | -18/+18 |
| | | | | |||||
* | | | | Fix IOError when fetching a new build by runner | Kamil Trzcinski | 2015-09-14 | 1 | -1/+8 |
| | | | | |||||
* | | | | Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' of ↵ | Valery Sizov | 2015-09-14 | 5 | -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-g | Dmitriy Zaporozhets | 2015-09-11 | 5 | -6/+35 |
| |\ \ \ \ | | |/ / / | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | Merge branch 'rs-fix-highlighting' into 'master' | Douwe Maan | 2015-09-11 | 1 | -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-highlighting | Robert Speicher | 2015-09-10 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Prevent result of SyntaxHighlightFilter being sanitized | Robert Speicher | 2015-09-10 | 1 | -4/+8 |
| | | | | | | |||||
| | * | | | | Add comments and clean up test for !1274 | Stan Hu | 2015-09-10 | 1 | -0/+2 |
| | |/ / / | |||||
| | * | | | Merge branch 'rescue-syntax-highlighting-errors' into 'master' | Robert Schilling | 2015-09-10 | 1 | -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 unformatted | Stan Hu | 2015-09-10 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | Closes #2433 | ||||
| | * | | | | Added service API endpoint to retrieve service parameters | Petheo Bence | 2015-09-10 | 2 | -0/+19 |
| | |/ / / | |||||
| | * | | | Merge branch 'fix-emojis-relative-url' into 'master' | Douwe Maan | 2015-09-09 | 1 | -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 used | Stan Hu | 2015-09-06 | 1 | -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 API | Valery Sizov | 2015-09-14 | 1 | -2/+6 |
|/ / / / / | |||||
* | | | | | Remove network from CI | Dmitriy Zaporozhets | 2015-09-11 | 2 | -3/+3 |
| | | | | | |||||
* | | | | | integration with gitlab auth | Valery Sizov | 2015-09-09 | 1 | -5/+5 |
| | | | | | |||||
* | | | | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | Dmitriy Zaporozhets | 2015-09-09 | 48 | -230/+1048 |
|\ \ \ \ \ | |/ / / / |