summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* 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 URL construction for merge requests, issues, notes, and commits for ↵Stan Hu2015-09-041-6/+2
| | | | | | relative URL config Closes https://github.com/gitlabhq/gitlabhq/issues/9605
* Merge branch 'grack-auth-new-instance' into 'master'Dmitriy Zaporozhets2015-09-021-0/+8
|\ | | | | | | | | | | | | | | | | 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
| * Avoid instance variable re-use troubleJacob Vosmaer2015-09-021-0/+8
| | | | | | | | | | 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.
* | Drone CI serviceKirilll Zaitsev2015-09-021-10/+15
|/
* Merge branch 'use_db_for_application_settings' into 'master'Marin Jankovski2015-09-011-1/+13
|\ | | | | | | | | | | | | | | 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
| * Added USE_DB env var to allow loading fake settings without db running.use_db_for_application_settingsMarin Jankovski2015-09-011-1/+13
| |
* | Merge branch 'rs-cleanup-redcarpet-renderer' into 'master'Douwe Maan2015-09-0120-18/+127
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Require gitlab/markdown in ReferenceExtractorRobert Speicher2015-09-011-0/+2
| | |
| * | Remove unnecessary `strip` from `reference_class` methodRobert Speicher2015-08-311-1/+1
| | |
| * | Move REDCARPET_OPTIONS to a private methodRobert Speicher2015-08-311-14/+16
| | | | | | | | | | | | | | | There wasn't really a reason to have them as a constant, and we were getting "already defined" warnings which are always annoying.
| * | Make sure the main Gitlab::Markdown module gets loaded before filtersRobert Speicher2015-08-2718-1/+28
| | |
| * | Reference filters no longer take a custom class context optionRobert Speicher2015-08-272-3/+1
| | |
| * | Decouple Gitlab::Markdown from the GitlabMarkdownHelperRobert Speicher2015-08-273-14/+94
| | | | | | | | | | | | | | | This module is now the sole source of knowledge for *how* we render Markdown (and GFM).
* | | Merge branch 'fix-bitbucket-import-issue-order' into 'master'Douwe Maan2015-09-015-13/+54
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Fix bug where only the first 15 Bitbucket issues would be imported.Stan Hu2015-09-015-13/+54
| | | | | | | | | | | | | | | | Also fix a number of issues where author/reporter names were not available.
| * | | Sort issues by creation date in Bitbucket importerStan Hu2015-09-011-1/+1
| | |/ | |/| | | | | | | | | | | | | API reference here: https://bitbucket.org/site/master/issues/3571/api-issues-sorting-bb-3518 Closes https://github.com/gitlabhq/gitlabhq/issues/9519
* | | Merge remote-tracking branch 'gitlab.com/master' into gitlab-git-http-serverJacob Vosmaer2015-08-314-4/+94
|\ \ \ | |/ /
| * | Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993Douwe Maan2015-08-2917-33/+429
| |\ \
| | * \ Merge branch 'fix-session_expire_delay' into 'master'Stan Hu2015-08-281-1/+1
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | 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
| | | * fixed connection detection so settings can be read from the databaseEric Maziade2015-08-271-1/+1
| | | |
| | * | Add `count` to Themes and ColorSchemesRobert Speicher2015-08-262-0/+10
| | | |
| | * | Add `Gitlab::Themes.for_user`Robert Speicher2015-08-261-0/+13
| | | |
| | * | Add Gitlab::ColorSchemes moduleRobert Speicher2015-08-251-0/+62
| | |/ | | | | | | | | | | | | Very similar to Gitlab::Theme, this contains all of the definitions for our syntax highlighting schemes.
| * | Minor refactorDouwe Maan2015-08-291-7/+8
| | |
| * | Issue #993: Fixed login failure when extern_uid changesJoel Koglin2015-08-211-3/+7
| | |
* | | Replace grack with gitlab-git-http-serverJacob Vosmaer2015-08-311-8/+8
| |/ |/|
* | Ability to search milestonesmilestone_searchValery Sizov2015-08-241-1/+13
| |
* | Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLabStan Hu2015-08-238-30/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'reply-by-email' into 'master'Robert Speicher2015-08-224-0/+269
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Reply by email Fixes #1360. It's far from done, but _it works_. See merge request !1173
| * | No HTML-only email pleaseDouwe Maan2015-08-212-153/+6
| | |
| * | Block blocked users from replying to threads by email.reply-by-emailDouwe Maan2015-08-211-0/+3
| | |
| * | Memoize address_regex locally.Douwe Maan2015-08-201-2/+3
| | |
| * | Fix spec by removing global state.Douwe Maan2015-08-201-8/+6
| | |
| * | Fix markdown specs.Douwe Maan2015-08-201-1/+1
| | |
| * | Fix indentationDouwe Maan2015-08-201-2/+2
| | |
| * | Add gitlab:reply_by_email:check rake task.Douwe Maan2015-08-201-3/+6
| | |
| * | Merge branch 'master' into reply-by-emailDouwe Maan2015-08-2013-635/+90
| |\ \ | | |/
| * | Test Gitlab::Email::Receiver.Douwe Maan2015-08-201-9/+9
| | |
| * | Make error class names more consistent.Douwe Maan2015-08-201-5/+5
| | |
| * | Fix a couple of whoopsy daisies.Douwe Maan2015-08-202-2/+4
| | |
| * | Extract ReplyParser and AttachmentUploader from Receiver.Douwe Maan2015-08-206-325/+362
| | |
| * | Start on tests.Douwe Maan2015-08-191-19/+18
| | |
| * | Send a rejection email when the incoming email couldn't be processed.Douwe Maan2015-08-191-6/+10
| | |
| * | Turn reply-by-email attachments into uploads.Douwe Maan2015-08-191-0/+33
| | |
| * | Changes and stuff.Douwe Maan2015-08-183-19/+305
| | |
| * | Reply by email POCDouwe Maan2015-08-181-0/+50
| | |
View Lorry Controller Status