| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix two places where we should be using `Rails.env.development?`rs-rails-env-predicates | Robert Speicher | 2015-04-20 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Marin Jankovski | 2015-04-20 | 1 | -2/+2 |
| |\ | |||||
| | * | Fix Resource Owner Password Authentication Flow | Roshan Gautam | 2015-04-17 | 1 | -2/+2 |
| | | | |||||
| * | | Add Markdown to Mime types | Robert Speicher | 2015-04-15 | 1 | -0/+2 |
| | | | |||||
| * | | Revert "Fix and improve help rendering" | Robert Speicher | 2015-04-15 | 1 | -1/+0 |
| |/ | | | | This reverts commit d365004e684e98459061fcd5fbaf9bea880934a8. | ||||
| * | Add config var to block auto-created LDAP users. | Douwe Maan | 2015-04-14 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'ldap_migration' | Dmitriy Zaporozhets | 2015-04-13 | 1 | -2/+4 |
| |\ | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: db/schema.rb | ||||
| | * | Call your existing LDAP server 'main' | Jacob Vosmaer | 2015-04-13 | 1 | -4/+0 |
| | | | | | | | | | | | By imposing this rule we avoid having to demand that 'ldapmain' exists in the settings initializer. | ||||
| | * | Simplify legacy LDAP config interpretation | Jacob Vosmaer | 2015-04-13 | 1 | -2/+3 |
| | | | |||||
| | * | fix ldap identities | Valery Sizov | 2015-04-11 | 1 | -1/+6 |
| | | | |||||
| * | | Merge branch 'shell-version-warning' into 'master' | Dmitriy Zaporozhets | 2015-04-13 | 1 | -0/+7 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | Warn when gitlab-shell version doesn't match requirement. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1791. See merge request !495 | ||||
| | * | | Warn when gitlab-shell version doesn't match requirement.shell-version-warning | Douwe Maan | 2015-04-06 | 1 | -0/+7 |
| | | | | |||||
| * | | | Use `\A` and `\z` in regexes instead of `^` and `$`. | Douwe Maan | 2015-04-10 | 1 | -1/+1 |
| | |/ |/| | |||||
| * | | Add lib/gitlab.rb to autoload non-conventional paths | Robert Speicher | 2015-04-09 | 1 | -0/+2 |
| | | | |||||
| * | | Revert "Preload lib/" | Robert Speicher | 2015-04-09 | 1 | -5/+0 |
| |/ | | | | This reverts commit 5511a731bcc05034abacd4ec01ff7d5a2a3b89d3. | ||||
| * | Merge remote-tracking branch 'github.com/master' | Douwe Maan | 2015-04-04 | 1 | -0/+1 |
| |\ | |||||
| | * | Fix and improve help rendering | Sullivan SENECHAL | 2015-04-03 | 1 | -0/+1 |
| | | | |||||
| * | | Remove sidekiq-limit_fetch because it require Redis 2.6.no-limit-fetch | Douwe Maan | 2015-04-03 | 1 | -2/+0 |
| | | | |||||
| * | | Merge branch 'custom-email-reply-to' into 'master' | Douwe Maan | 2015-04-03 | 1 | -0/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ability to configure Reply-To address ### What does this MR do? This MR adds configuration variable `email_reply_to` to make it possible to configure a custom Reply-To address other than the default `noreply@mydomain.com`. ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? #1305 See merge request !455 | ||||
| | * | | Add ability to configure Reply-To address in gitlab.yml | Stan Hu | 2015-04-03 | 1 | -0/+1 |
| | | | | | | | | | | | | | Closes #1305 | ||||
| * | | | Merge branch 'configurable-attachment-size' into 'master' | Douwe Maan | 2015-04-03 | 1 | -0/+1 |
| |\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support configurable attachment size in Application Settings page ### What does this MR do? This MR provides the ability to configure the maximum size of an attachment inside a note. A parameter has been added to the Application Settings page. ### Are there points in the code the reviewer needs to double check? What should be done with the legacy note attachment validation? I added code to make the validation work with the configurable setting. I could see an issue where an admin lowers the limit from 10 megabytes to 5 megabytes, which could cause an existing model to be invalid. ### Why was this MR needed? We often have attachments that exceed 10 MB, and it would be nice to be able to override the defaults. ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? See Issue #1258 ### Screenshots Before:  After:  See merge request !407 | ||||
| | * | | Support configurable attachment size via Application Settings | Stan Hu | 2015-04-02 | 1 | -0/+1 |
| | |/ | | | | | | | | | | | Fix bug where error messages from Dropzone would not be displayed on the issues page Closes #1258 | ||||
| * | | Limit number of concurrent archive_repo jobs to 2. | Douwe Maan | 2015-03-31 | 1 | -0/+2 |
| |/ | |||||
| * | update acts-as-taggable-on | Nihad Abbasov | 2015-03-29 | 1 | -131/+0 |
| | | |||||
| * | Reduce Rack Attack false positives by clearing out auth failure count upon | Stan Hu | 2015-03-24 | 1 | -0/+1 |
| | | | | | | | | | successful Git over HTTP authentication. Add logging when a ban goes into effect for debugging. Issue #1171 | ||||
| * | Fix typo. | Marin Jankovski | 2015-03-20 | 1 | -1/+1 |
| | | |||||
| * | Change the name of the key used for bitbucket importer. | Marin Jankovski | 2015-03-20 | 1 | -1/+1 |
| | | |||||
| * | Revert "Increase timeout for Git-over-HTTP requests." | Dmitriy Zaporozhets | 2015-03-19 | 1 | -8/+0 |
| | | | | | | | | This reverts commit 516bcabbf42d60db2ac989dce4c7187b2a1e5de9. Conflicts: Gemfile | ||||
| * | Make email display name configurable | Vyacheslav Slinko | 2015-03-11 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'smtp_example_update' into 'master' | Marin Jankovski | 2015-03-09 | 1 | -1/+4 |
| |\ | | | | | | | | | | | | | | | Add link to smtp documentation. Closes #2070 See merge request !1627 | ||||
| | * | Add link to smtp documentation. | Marin Jankovski | 2015-03-04 | 1 | -1/+4 |
| | | | |||||
| * | | Increase timeout for Git-over-HTTP requests. | Douwe Maan | 2015-03-04 | 1 | -0/+8 |
| |/ | |||||
| * | Fix specs. | Douwe Maan | 2015-02-24 | 1 | -1/+1 |
| | | |||||
| * | Load public key in initializer. | Douwe Maan | 2015-02-24 | 1 | -0/+2 |
| | | |||||
| * | Change check to only swap static middleware when it's enabled. | Douwe Maan | 2015-02-21 | 1 | -5/+2 |
| | | |||||
| * | Explain `Gitlab::Middleware::Static`. | Douwe Maan | 2015-02-20 | 1 | -0/+5 |
| | | |||||
| * | Satisfy Rubocop. | Douwe Maan | 2015-02-20 | 1 | -1/+1 |
| | | |||||
| * | Use modified ActionDispatch::Static to let uploads go through to routes. | Douwe Maan | 2015-02-20 | 1 | -0/+13 |
| | | |||||
| * | Add link to share via twitter to "created project" event. | Douwe Maan | 2015-02-13 | 1 | -0/+1 |
| | | |||||
| * | Extend issue closing pattern. | Douwe Maan | 2015-02-08 | 1 | -1/+1 |
| | | |||||
| * | Add openssl_verify_mode option to the smtp configuration example. | Marin Jankovski | 2015-02-05 | 1 | -2/+3 |
| | | |||||
| * | GitLab integration. Importer | Valery Sizov | 2015-02-05 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #8449 from choppsv1/ipv6_addr_fix | Dmitriy Zaporozhets | 2015-02-04 | 1 | -1/+5 |
| |\ | | | | | Add []s around user@ipv6addr (e.g., "[git@::1]/repo.git") | ||||
| | * | Add []s around user@ipv6addr (e.g., "[git@::1]/repo.git") | Christian E. Hopps | 2014-12-15 | 1 | -1/+5 |
| | | | |||||
| * | | Merge branch 'master' into mwessel/gitlab-ce-configure-protection | Dmitriy Zaporozhets | 2015-02-03 | 6 | -32/+41 |
| |\ \ | |||||
| | * | | Rubocop: indentation fixes Yay!!! | Dmitriy Zaporozhets | 2015-02-02 | 1 | -12/+12 |
| | | | | |||||
| | * | | Rubocop: no trailing newlines | Dmitriy Zaporozhets | 2015-02-02 | 2 | -2/+2 |
| | | | | |||||
| | * | | Rubocop: Style/ElseAlignment enabled | Dmitriy Zaporozhets | 2015-02-02 | 1 | -5/+6 |
| | | | | |||||
| | * | | Rubocop: comment indentation | Dmitriy Zaporozhets | 2015-02-02 | 1 | -5/+13 |
| | | | | |||||
| | * | | Rubocop enabled for: Use spaces inside hash literal braces | Dmitriy Zaporozhets | 2015-02-02 | 2 | -2/+2 |
| | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |