Tomasz Maczukin 3cfd892f38 Merge branch 'master' into fix/visibility-level-setting-in-forked-projects ... * master: (723 commits) Bump Rack Attack to v4.3.1 for security fix Remove duplicate entry in the changelog Remove extra spaces after branchname Fix merge-request-reopen button title Add branch and tag operation to tree dropdown Use gitlab-shell 2.6.9 Clarify Windows shell executor artifact upload support Fix feature specs: we always show the build status if ci_commit is present Do not display project group/name when issue and MR are in same project Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the builds are enabled Use gitlab-workhorse 0.5.1 Fix ci_projects migration by using the value only from latest row [ci skip] Revert sidebar position for issue and merge request Add info on using private Docker registries in CI [ci skip] Upgrade Poltergeist to 1.8.1. #4131 Fix ux issue with "This issue will be closed automatically" message Move MR Builds tab next to Commits Api support for requesting starred projects for user Fix Rubocop complain. Fix merge widget JS for buttons ... Conflicts: app/models/project.rb		2015-12-21 13:27:34 +01:00
..
backend	Fixed Rubocop offenses	2015-12-15 00:53:52 -02:00
bitbucket_import	Fixed Rubocop offenses	2015-12-15 00:53:52 -02:00
diff	Fixed Rubocop offenses	2015-12-15 00:53:52 -02:00
email	Mix url helpers in into RepositoryPush	2015-12-11 13:00:24 +00:00
fogbugz_import	Fixed Rubocop offenses	2015-12-15 00:53:52 -02:00
git	Fire update hook from GitLab	2015-11-30 18:36:34 +02:00
github_import	fix specs	2015-11-30 16:12:31 +02:00
gitlab_import	Fixed Rubocop offenses	2015-12-15 00:53:52 -02:00
gitorious_import	Fixed Rubocop offenses	2015-12-15 00:53:52 -02:00
google_code_import	Fixed Rubocop offenses	2015-12-15 00:53:52 -02:00
graphs
ldap	Block LDAP user when they are no longer found in the LDAP server	2015-12-08 11:15:30 -06:00
lfs	Recursivity needed if a fork is a fork of a fork.	2015-12-04 12:32:13 +01:00
markdown	Move Markdown/reference logic from Gitlab::Markdown to Banzai	2015-12-15 15:51:16 +01:00
middleware	Revert "Increase timeout for Git-over-HTTP requests."	2015-03-19 18:29:20 -07:00
o_auth	AuthHash should not parameterize email user	2015-12-10 18:49:48 -05:00
sherlock	Added total query time to Sherlock	2015-11-24 10:57:21 +01:00
sidekiq_middleware	Use SIGKILL by default in Sidekiq::MemoryKiller	2015-05-13 17:09:12 +02:00
sql	Fix UNION syntax for MySQL	2015-11-18 13:31:18 +01:00
access.rb	Improve description of branch protection levels.	2015-05-13 09:41:55 +02:00
app_logger.rb
asciidoc.rb	Move Markdown/reference logic from Gitlab::Markdown to Banzai	2015-12-15 15:51:16 +01:00
auth.rb
bitbucket_import.rb
build_data_builder.rb	Migrate CI::Project to Project	2015-12-11 18:02:09 +01:00
closing_issue_extractor.rb	Allow invalid URLs in closing pattern	2015-12-02 18:48:39 +01:00
color_schemes.rb	Add count to Themes and ColorSchemes	2015-08-26 11:30:38 -07:00
compare_result.rb	Add ignore white space option in merge request diff	2015-11-13 16:53:53 +09:00
config_helper.rb
contributions_calendar.rb	Fix rubocop warnings in lib	2015-10-03 01:29:58 -05:00
contributor.rb	Move lib/gitlab/contributors to its correct path	2015-04-09 15:34:55 -04:00
current_settings.rb	Expose artifacts path	2015-11-23 13:05:22 +01:00
database.rb	Migrate CI WebHooks and Emails to new tables	2015-12-10 16:04:08 +01:00
force_push_check.rb	Replace all usages of git command with configurable binary path	2015-11-03 17:11:09 -05:00
git.rb	Use Gitlab::Git helper methods and constants as much as possible.	2015-03-10 13:39:31 +01:00
git_access.rb	Add support for git lfs.	2015-11-16 12:39:13 +01:00
git_access_status.rb
git_access_wiki.rb	Rename abilities to correspond contoller/model action names	2015-06-26 15:55:56 +02:00
git_logger.rb
git_ref_validator.rb	Replace all usages of git command with configurable binary path	2015-11-03 17:11:09 -05:00
gitorious_import.rb	Define GITORIOUS_HOST only once	2015-06-10 01:31:27 -04:00
identifier.rb	Use project.commit convenience method.	2015-04-24 12:29:36 +02:00
import_formatter.rb	Fix bug where only the first 15 Bitbucket issues would be imported.	2015-09-01 08:50:20 -07:00
import_sources.rb	FogBugz project import	2015-09-08 20:23:01 -04:00
incoming_email.rb	Make Reply by email easier to configure	2015-10-13 13:10:49 +02:00
inline_diff.rb	Move spec to proper place and fix unused variable	2015-11-13 09:45:21 +01:00
issues_labels.rb
key_fingerprint.rb	Simplify regex.	2015-04-14 15:58:28 +02:00
logger.rb
markup_helper.rb	markup_helper: detect .mkd and .mkdn as markdown	2015-08-12 15:29:15 -04:00
note_data_builder.rb	No longer needed to pass project argument to commit methods.	2015-04-24 12:29:36 +02:00
popen.rb	Style/RedundantReturn enabled	2015-03-24 18:35:57 -07:00
production_logger.rb
project_search_results.rb	Fix commits search for empty repository	2015-11-03 10:16:09 +01:00
push_data_builder.rb	fixes after review	2015-12-07 15:13:06 +02:00
reference_extractor.rb	Move Markdown/reference logic from Gitlab::Markdown to Banzai	2015-12-15 15:51:16 +01:00
regex.rb	Add ability to create directories in the editor	2015-10-29 15:49:07 +01:00
search_results.rb	Ability to search milestones	2015-08-24 13:59:01 +03:00
seeder.rb	Migrate mailers to ActiveJob	2015-11-26 17:03:43 +02:00
sherlock.rb	Only load rblineprof when actually needed	2015-11-09 15:54:13 +01:00
sidekiq_logger.rb
snippet_search_results.rb
themes.rb	Add count to Themes and ColorSchemes	2015-08-26 11:30:38 -07:00
upgrader.rb	Replace all usages of git command with configurable binary path	2015-11-03 17:11:09 -05:00
uploads_transfer.rb	Fix: Images cannot show when projects' path was changed	2015-10-14 18:50:35 +03:00
url_builder.rb	Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g	2015-09-09 14:56:02 +02:00
user_access.rb
utils.rb	add common method to force utf8 and force oauth properties to be utf8	2015-05-03 00:43:46 +03:00
version_info.rb
visibility_level.rb	Fix GitlabV::isibilityLevel::level_name method	2015-11-04 22:13:40 +01:00