gitlab-org--gitlab-foss/lib
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
..
api Merge branch 'api-support-starred-projects' into 'master' 2015-12-16 22:49:28 +00:00
assets
backup Backup LFS objects same as any upload. 2015-11-19 10:43:45 +01:00
banzai Temporarily disable Markdown caching 2015-12-16 18:50:06 +01:00
ci Merge branch 'master' into ci/persist-registration-token 2015-12-14 12:26:40 +01:00
gitlab Merge branch 'master' into fix/visibility-level-setting-in-forked-projects 2015-12-21 13:27:34 +01:00
omni_auth Fix signin with OmniAuth providers 2015-12-08 14:58:15 +01:00
rouge/formatters Fixed Rubocop offenses 2015-12-15 00:53:52 -02:00
support Update init script options for gitlab-workhorse 2015-12-15 16:24:04 +01:00
tasks Merge branch 'add_user_repo_integrity_rake_task' into 'master' 2015-12-15 18:36:28 +00:00
award_emoji.rb emoji aliases problem 2015-12-11 13:17:12 +02:00
banzai.rb Move Markdown/reference logic from Gitlab::Markdown to Banzai 2015-12-15 15:51:16 +01:00
disable_email_interceptor.rb
event_filter.rb Fix rubocop warnings in lib 2015-10-03 01:29:58 -05:00
extracts_path.rb Only render 404 page from /public 2015-10-13 20:12:34 +03:00
file_size_validator.rb
file_streamer.rb Implement Build Artifacts 2015-11-10 12:51:50 +01:00
gitlab.rb Revert "Merge branch 'revert-satellites' into 'master' " 2015-08-11 14:33:31 +02:00
gt_one_coercion.rb
repository_cache.rb
static_model.rb
unfold_form.rb
uploaded_file.rb Implement Build Artifacts 2015-11-10 12:51:50 +01:00
version_check.rb