Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-09-16Merge branch 'ldap-attributes' into 'master'Robert Speicher
Allow configuration of LDAP attributes GitLab will use for the new user account. Fixes #2412. See merge request !1261
2015-09-16Make code clearerDouwe Maan
2015-09-11Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-11Merge branch 'rs-fix-highlighting' into 'master'Douwe Maan
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-11Add comments and clean up test for !1274Stan Hu
2015-09-10RU-BO-COOOOOOOOPRobert Speicher
2015-09-10Prevent result of SyntaxHighlightFilter being sanitizedRobert Speicher
2015-09-10Gracefully handle errors in syntax highlighting by leaving the block unformattedStan Hu
Closes #2433
2015-09-09Merge branch 'fix-emojis-relative-url' into 'master'Douwe Maan
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-09Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets
2015-09-09Move helpers back to original directoryDmitriy Zaporozhets
2015-09-09Shuffle config around a bitDouwe Maan
2015-09-09FogBugz project importJared Szechy
2015-09-08Add attributes to LDAP::Config.Douwe Maan
2015-09-08Allow configuration of LDAP attributes GitLab will use for the new user account.Douwe Maan
2015-09-06Fix emoji URLs in Markdown when relative_url_root is usedStan Hu
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-05Fix URL construction for merge requests, issues, notes, and commits for ↵Stan Hu
relative URL config Closes https://github.com/gitlabhq/gitlabhq/issues/9605
2015-09-02Merge branch 'grack-auth-new-instance' into 'master'Dmitriy Zaporozhets
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-02Avoid instance variable re-use troubleJacob Vosmaer
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-02Drone CI serviceKirilll Zaitsev
2015-09-02Merge branch 'use_db_for_application_settings' into 'master'Marin Jankovski
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-01Merge branch 'rs-cleanup-redcarpet-renderer' into 'master'Douwe Maan
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-01Merge branch 'fix-bitbucket-import-issue-order' into 'master'Douwe Maan
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-01Require gitlab/markdown in ReferenceExtractorRobert Speicher
2015-09-01Fix bug where only the first 15 Bitbucket issues would be imported.Stan Hu
Also fix a number of issues where author/reporter names were not available.
2015-09-01Added USE_DB env var to allow loading fake settings without db running.Marin Jankovski
2015-09-01Sort issues by creation date in Bitbucket importerStan Hu
API reference here: https://bitbucket.org/site/master/issues/3571/api-issues-sorting-bb-3518 Closes https://github.com/gitlabhq/gitlabhq/issues/9519
2015-08-31Remove unnecessary `strip` from `reference_class` methodRobert Speicher
2015-08-31Move REDCARPET_OPTIONS to a private methodRobert Speicher
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-31Merge remote-tracking branch 'gitlab.com/master' into gitlab-git-http-serverJacob Vosmaer
2015-08-31Replace grack with gitlab-git-http-serverJacob Vosmaer
2015-08-29Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993Douwe Maan
2015-08-29Minor refactorDouwe Maan
2015-08-28Merge branch 'fix-session_expire_delay' into 'master'Stan Hu
read session_expire_delay from database if table & column exists; Previous code only ends up using the default value for session_expire_delay, not the value stored in the database, making the session always 1 week. See merge request !1217
2015-08-28fixed connection detection so settings can be read from the databaseEric Maziade
2015-08-28Make sure the main Gitlab::Markdown module gets loaded before filtersRobert Speicher
2015-08-28Reference filters no longer take a custom class context optionRobert Speicher
2015-08-28Decouple Gitlab::Markdown from the GitlabMarkdownHelperRobert Speicher
This module is now the sole source of knowledge for *how* we render Markdown (and GFM).
2015-08-26Add `count` to Themes and ColorSchemesRobert Speicher
2015-08-26Add `Gitlab::Themes.for_user`Robert Speicher
2015-08-26Groundwork for merging CI into CEDouwe Maan
2015-08-26Add Gitlab::ColorSchemes moduleRobert Speicher
Very similar to Gitlab::Theme, this contains all of the definitions for our syntax highlighting schemes.
2015-08-24Ability to search milestonesValery Sizov
2015-08-23Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLabStan Hu
and request them each session. Pass these tokens to the project import data. This prevents the need to encrypt these tokens and clear them in case they expire or get revoked. For example, if you deleted and re-created OAuth2 keys for Bitbucket, you would get an Error 500 with no way to recover: ``` Started GET "/import/bitbucket/status" for x.x.x.x at 2015-08-07 05:24:10 +0000 Processing by Import::BitbucketController#status as HTML Completed 500 Internal Server Error in 607ms (ActiveRecord: 2.3ms) NameError (uninitialized constant Import::BitbucketController::Unauthorized): app/controllers/import/bitbucket_controller.rb:77:in `rescue in go_to_bitbucket_for_permissions' app/controllers/import/bitbucket_controller.rb:74:in `go_to_bitbucket_for_permissions' app/controllers/import/bitbucket_controller.rb:86:in `bitbucket_unauthorized' ``` Closes #1871
2015-08-22Merge branch 'reply-by-email' into 'master'Robert Speicher
Reply by email Fixes #1360. It's far from done, but _it works_. See merge request !1173
2015-08-22No HTML-only email pleaseDouwe Maan
2015-08-21Block blocked users from replying to threads by email.Douwe Maan
2015-08-21Issue #993: Fixed login failure when extern_uid changesJoel Koglin
2015-08-21Remove trailing HTML entities from non-Rinku autolinks as well.Robert Speicher
2015-08-21Memoize address_regex locally.Douwe Maan