Lin Jen-Shin f39ba1bb5e Merge remote-tracking branch 'upstream/master' into pipeline-emails ... * upstream/master: (372 commits) Enable Lint/StringConversionInInterpolation cop and autocorrect offenses resolve duplicated changelog entry credit myself 😄 change determine conditions override subject method in devise mailer follow the styleguide: Don't use parentheses around a literal wrap subject with method subject move spec back into shared example `an email sent from GitLab` stub config settings in spec remove empty line at block body end remove extra entry create new test in `spec/mailers/notify_spec.rb` move changelog to 8.13 add configurable email subject suffix Fixes sidebar navigation. Convert "SSH Keys" Spinach features to RSpec Enable import/export back for non-admins Update gitlab-shell to 3.6.3 Updated artwork of empty group state. Better empty state for Groups view. ...		2016-10-04 02:38:25 +08:00
..
auth	Move logic to check ci? or lfs_deploy_token? to Gitlab::Auth::Result	2016-09-20 11:03:10 +02:00
backend	Strip comments before sending keys to gitlab-shell	2016-09-16 11:49:11 +02:00
badge
bitbucket_import	Rename gl_user_id to gitlab_user_id in importer classes	2016-09-08 11:57:22 +10:00
checks	Avoid protected branches checks when verifying access without branch name	2016-09-13 11:50:13 +02:00
ci	Merge remote-tracking branch 'upstream/master' into pipeline-emails	2016-09-21 16:19:07 +08:00
conflict	Fix merge conflict size limit	2016-09-07 16:00:26 +01:00
data_builder
database	Implement fourth round of comments from @DouweM.	2016-09-21 09:57:14 +05:30
diff
downtime_check
email
fogbugz_import
gfm
git	Clean environment variables when running git hooks	2016-09-15 08:51:55 +03:00
github_import	Call after_remove_branch only once after importing all GitHub PRs	2016-09-27 20:45:07 +02:00
gitlab_import	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	2016-09-08 17:43:19 +03:00
google_code_import
graphs
import_export	fix model order in import/export config and 1to1 relation issue. Added relevant specs.	2016-09-27 14:56:33 +02:00
ldap	Log LDAP lookup errors and don't swallow unrelated exceptions	2016-09-28 07:44:58 +02:00
markdown
metrics
middleware
o_auth
request_profiler
saml
sanitizers
sherlock
sidekiq_middleware	Merge branch 'aiionx_sidekiq_log_patch' into 'master'	2016-10-03 14:20:18 +00:00
slash_commands
sql
template
access.rb	Allow Member.add_user to handle access requesters	2016-09-28 09:43:00 +02:00
app_logger.rb
asciidoc.rb
auth.rb	Handle LFS token creation and retrieval in the same method, and in the same Redis connection.	2016-09-28 12:13:48 -05:00
award_emoji.rb
bitbucket_import.rb
blame.rb
changes_list.rb
closing_issue_extractor.rb
color_schemes.rb
config_helper.rb
contributions_calendar.rb	Replace contributions calendar timezone payload with dates	2016-09-16 14:38:59 -05:00
contributor.rb
current_settings.rb	Remove use of USE_DB environment variable in code	2016-09-23 10:50:46 +02:00
database.rb
devise_failure.rb
downtime_check.rb
emoji.rb
exclusive_lease.rb
git.rb	Add spec covering 'committer_hash'	2016-09-20 10:15:43 -07:00
git_access.rb	Rename capabilities to authentication_abilities	2016-09-16 11:12:21 +02:00
git_access_status.rb
git_access_wiki.rb
git_logger.rb
git_post_receive.rb
git_ref_validator.rb
gl_id.rb
gon_helper.rb	Stop putting private tokens in Gon	2016-09-19 12:27:37 +01:00
highlight.rb
identifier.rb
import_export.rb	Fixed label color issue and added Import/Export versioning table	2016-09-19 09:18:37 +02:00
import_formatter.rb
import_sources.rb
incoming_email.rb
issues_labels.rb
key_fingerprint.rb
lazy.rb
lfs_token.rb	Fix race condition that can be triggered if the token expires right after we retrieve it, but before we can set the new expiry time.	2016-09-29 10:25:26 -05:00
logger.rb
mail_room.rb
markup_helper.rb
metrics.rb
other_markup.rb
popen.rb	Fix Gitlab::Popen.popen thread-safety issue	2016-09-13 21:39:46 +02:00
production_logger.rb
project_search_results.rb
protocol_access.rb
recaptcha.rb
redis.rb	Initialize Redis pool in single-threaded context	2016-09-30 12:27:43 +02:00
reference_extractor.rb
regex.rb	Remove trailing spaces from messages in Gitlab::Regex	2016-09-20 07:20:48 +03:00
repository_check_logger.rb
request_profiler.rb
routing.rb
search_results.rb
seeder.rb
sentry.rb
sherlock.rb
sidekiq_logger.rb
snippet_search_results.rb
themes.rb
timeless.rb
upgrader.rb
uploads_transfer.rb
url_builder.rb
url_sanitizer.rb
user_access.rb
utils.rb
version_info.rb
visibility_level.rb
workhorse.rb	Use base SHA for patches and diffs	2016-09-22 18:49:31 +01:00