home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 08:06:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
16,012 Commits 48 Branches 340 Tags
9faa00a7df01bd5a296ce1a325c8102ff48dc940
Commit Graph
331 Commits
Author SHA1 Message Date
Robert Speicher 2c90579749 Set default_url_options in test environments too 2015-04-25 19:46:05 -04:00
Robert Speicher b71e5a17e9 Add default_url_options initializer 
Fixes #2266
 2015-04-23 12:58:11 -04:00
Robert Speicher 6c3591279f Fix two places where we should be using Rails.env.development? 2015-04-20 18:28:19 -04:00
Marin Jankovski 225b43de22 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-20 09:43:28 +02:00
Roshan Gautam 984f8077b3 Fix Resource Owner Password Authentication Flow 2015-04-17 11:47:02 -05:00
Robert Speicher 1e27b68b36 Add Markdown to Mime types 2015-04-15 12:25:24 -04:00
Robert Speicher ef47ea3d39 Revert "Fix and improve help rendering" 
This reverts commit d365004e68.
 2015-04-15 12:24:44 -04:00
Douwe Maan 238e4f0295 Add config var to block auto-created LDAP users. 2015-04-14 17:09:05 +02:00
Dmitriy Zaporozhets 4ab717ea6a Merge branch 'ldap_migration' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
 2015-04-13 17:18:02 +03:00
Jacob Vosmaer f39b150a02 Call your existing LDAP server 'main' 
By imposing this rule we avoid having to demand that 'ldapmain' exists
in the settings initializer.
 2015-04-13 15:45:19 +02:00
Dmitriy Zaporozhets 7f04a4174e Merge branch 'shell-version-warning' into 'master' 
Warn when gitlab-shell version doesn't match requirement.

Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1791.

See merge request !495
 2015-04-13 13:05:47 +00:00
Jacob Vosmaer ec7a68a1a5 Simplify legacy LDAP config interpretation 2015-04-13 11:50:44 +02:00
Valery Sizov 8666f497ff fix ldap identities 2015-04-11 17:56:45 +03:00
Douwe Maan 0ece6bd828 Use \A and \z in regexes instead of ^ and $. 2015-04-10 18:31:07 +02:00
Robert Speicher 91c39fd8c7 Add lib/gitlab.rb to autoload non-conventional paths 2015-04-09 14:19:25 -04:00
Robert Speicher a3601d6005 Revert "Preload lib/" 
This reverts commit 5511a731bc.
 2015-04-09 12:21:59 -04:00
Douwe Maan f915a4b80f Warn when gitlab-shell version doesn't match requirement. 2015-04-06 14:02:49 +02:00
Douwe Maan 45ca39e81b Merge remote-tracking branch 'github.com/master' 2015-04-04 14:23:32 +02:00
Douwe Maan bc2edc359d Remove sidekiq-limit_fetch because it require Redis 2.6. 2015-04-03 18:38:31 +02:00
Douwe Maan 04a42ce3f1 Merge branch 'custom-email-reply-to' into 'master' 
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
 2015-04-03 15:14:04 +00:00
Stan Hu 81a5a9713d Add ability to configure Reply-To address in gitlab.yml 
Closes #1305
 2015-04-03 06:47:54 -07:00
Sullivan SENECHALandSullivan SENECHAL d365004e68 Fix and improve help rendering 2015-04-03 11:56:50 +02:00
Douwe Maan 317206300d Merge branch 'configurable-attachment-size' into 'master' 
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:

![Screen_Shot_2015-03-29_at_3.06.53_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6013a1dbc8cf61a63e93744149937fa0/Screen_Shot_2015-03-29_at_3.06.53_PM.png)

After:

![Screen_Shot_2015-03-29_at_3.12.34_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/f3518af7e8653ba40f0a3579456da6ad/Screen_Shot_2015-03-29_at_3.12.34_PM.png)

See merge request !407
 2015-04-03 08:47:55 +00:00
Stan Hu dfd256f29e Support configurable attachment size via Application Settings 
Fix bug where error messages from Dropzone would not be displayed on the issues page

Closes #1258
 2015-04-02 00:04:08 -07:00
Douwe Maan e7bbd85b34 Limit number of concurrent archive_repo jobs to 2. 2015-03-31 12:52:20 +02:00
Nihad Abbasov be65373fc7 update acts-as-taggable-on 2015-03-29 03:39:32 +04:00
Stan Hu 56d87db32c Reduce Rack Attack false positives by clearing out auth failure count upon 
successful Git over HTTP authentication.

Add logging when a ban goes into effect for debugging.

Issue #1171
 2015-03-24 00:36:46 -07:00
Marin Jankovski 603b88ab5c Fix typo. 2015-03-20 16:13:03 -07:00
Marin Jankovski b7229356d5 Change the name of the key used for bitbucket importer. 2015-03-20 15:54:11 -07:00
Dmitriy Zaporozhets efd8491d49 Revert "Increase timeout for Git-over-HTTP requests." 
This reverts commit 516bcabbf4.

Conflicts:
	Gemfile
 2015-03-19 18:29:20 -07:00
Vyacheslav Slinko 61ed518781 Make email display name configurable 2015-03-11 11:04:23 +07:00
Marin Jankovski 41913fcc09 Merge branch 'smtp_example_update' into 'master' 
Add link to smtp documentation.

Closes #2070

See merge request !1627
 2015-03-09 16:23:43 +00:00
Douwe Maan 516bcabbf4 Increase timeout for Git-over-HTTP requests. 2015-03-04 23:20:47 +01:00
Marin Jankovski 890f14786a Add link to smtp documentation. 2015-03-04 09:04:23 -08:00
Douwe Maan f2b37de54b Fix specs. 2015-02-24 15:07:24 +01:00
Douwe Maan 448817c4de Load public key in initializer. 2015-02-24 15:07:24 +01:00
Douwe Maan 452ba19cdd Change check to only swap static middleware when it's enabled. 2015-02-21 15:09:17 +01:00
Douwe Maan 6945f4a299 Explain Gitlab::Middleware::Static. 2015-02-20 23:30:06 +01:00
Douwe Maan 938a1381fc Satisfy Rubocop. 2015-02-20 16:04:03 +01:00
Douwe Maan 4310431ee7 Use modified ActionDispatch::Static to let uploads go through to routes. 2015-02-20 12:44:07 +01:00
Douwe Maan ce08f919bf Add link to share via twitter to "created project" event. 2015-02-13 12:07:59 +01:00
Douwe Maan fd21d72b1b Extend issue closing pattern. 2015-02-08 13:56:12 +01:00
Marin Jankovski 631bbe50ff Add openssl_verify_mode option to the smtp configuration example. 2015-02-05 21:49:15 -08:00
Valery Sizov 5194214e3a GitLab integration. Importer 2015-02-05 12:50:34 -08:00
Dmitriy Zaporozhets 028b58a987 Merge pull request #8449 from choppsv1/ipv6_addr_fix 
Add []s around user@ipv6addr (e.g., "[git@::1]/repo.git")
 2015-02-04 14:51:06 -08:00
Dmitriy Zaporozhets 635ebac606 Merge branch 'master' into mwessel/gitlab-ce-configure-protection 2015-02-03 17:54:33 -08:00
Dmitriy Zaporozhets 61cc6a9244 Rubocop: indentation fixes Yay!!! 2015-02-02 21:59:28 -08:00
Dmitriy Zaporozhets d04344373b Rubocop: no trailing newlines 2015-02-02 21:53:27 -08:00
Dmitriy Zaporozhets 647ff6240e Rubocop: Style/ElseAlignment enabled 2015-02-02 21:38:50 -08:00
Dmitriy Zaporozhets 7d48205c1a Rubocop: comment indentation 2015-02-02 21:34:16 -08:00