gitlab-org--gitlab-foss/app/models
Lin Jen-Shin 596f46881f Merge remote-tracking branch 'upstream/master' into save-artifacts_sizes
* upstream/master: (175 commits)
  Document Repository#keep_around
  Don't garbage collect commits that have related DB records like comments
  Update CHANGELOG
  Update RedCloth to 4.3.2 for CVE-2012-6684
  Fix typo in Merge Requests API documentation
  Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiq
  Enable Style/EmptyLines cop, remove redundant ones
  Update CHANGELOG
  Cache results from jQuery selectors to retrieve namespace name
  Fix import button when import fail due the namespace already been taken
  Fix snippets comments not displayed
  Fix emoji paths in relative root configurations
  Exclude requesters from Project#members, Group#members and User#members
  Upgrade Thin from 1.6.1 to 1.7.0.
  Many squashed commits
  Cache autocomplete results
  Upgrade Sidekiq from 4.1.2 to 4.1.4.
  Upgrade seed-fu from 2.3.5 to 2.3.6
  use has_many relationship with events
  Support creating a todo on issuables via API
  ...
2016-07-04 19:14:54 +08:00
..
ci Merge remote-tracking branch 'upstream/master' into save-artifacts_sizes 2016-07-04 19:14:54 +08:00
concerns Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
hooks Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
members Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
network Enable Style/SpaceAfterComma Rubocop cop 2016-06-29 15:23:44 +02:00
project_services Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
.gitkeep
ability.rb Disable Metrics/CyclomaticComplexity for Ability.allowed 2016-06-30 21:38:29 +08:00
abuse_report.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
appearance.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
application_setting.rb Add Application Setting to configure default Repository Path for new projects 2016-06-29 23:35:00 -04:00
audit_event.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
award_emoji.rb Fix latests concerns 2016-05-18 08:47:15 -05:00
blob.rb Revert "squashed merge and fixed conflicts" 2016-06-16 12:59:07 +02:00
broadcast_message.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
commit.rb Optimize Banzai::Filter::RelativeLinkFilter 2016-06-21 10:53:16 -04:00
commit_range.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
commit_status.rb Rename commit_data in Pipeline to commit 2016-06-21 14:43:37 +02:00
deploy_key.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
deploy_keys_project.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
deployment.rb Revert "squashed merge and fixed conflicts" 2016-06-16 12:59:07 +02:00
email.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
environment.rb Revert "squashed merge and fixed conflicts" 2016-06-16 12:59:07 +02:00
event.rb Display last commit of deleted branch in push events (!4699) 2016-06-28 11:49:30 +02:00
external_issue.rb
forked_project_link.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
generic_commit_status.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
global_label.rb
global_milestone.rb
group.rb Exclude requesters from Project#members, Group#members and User#members 2016-07-01 17:44:46 +02:00
identity.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
issue.rb use has_many relationship with events 2016-07-01 15:34:10 +02:00
key.rb Remove Duplicated keys add UNIQUE index to fingerprint 2016-06-20 13:29:04 +02:00
label.rb Fix label order by priority on labels page 2016-06-07 14:01:30 +01:00
label_link.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
legacy_diff_note.rb Restore old behavior around diff notes to outdated discussions 2016-06-22 22:09:11 -04:00
lfs_object.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
lfs_objects_project.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
member.rb Exclude requesters from Project#members, Group#members and User#members 2016-07-01 17:44:46 +02:00
merge_request.rb Don't garbage collect commits that have related DB records like comments 2016-07-04 00:11:33 -04:00
merge_request_diff.rb Don't garbage collect commits that have related DB records like comments 2016-07-04 00:11:33 -04:00
milestone.rb use has_many relationship with events 2016-07-01 15:34:10 +02:00
namespace.rb Refactor repository paths handling to allow multiple git mount points 2016-06-29 22:30:31 -04:00
note.rb Don't garbage collect commits that have related DB records like comments 2016-07-04 00:11:33 -04:00
notification_setting.rb Revert "squashed merge and fixed conflicts" 2016-06-16 12:59:07 +02:00
oauth_access_token.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
personal_access_token.rb
personal_snippet.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
project.rb Exclude requesters from Project#members, Group#members and User#members 2016-07-01 17:44:46 +02:00
project_group_link.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
project_import_data.rb add missing attribute to attr_encrypted so it is fully backwards-compatible 2016-06-28 09:55:19 +02:00
project_snippet.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
project_team.rb Exclude requesters from Project#members, Group#members and User#members 2016-07-01 17:44:46 +02:00
project_wiki.rb Refactor repository paths handling to allow multiple git mount points 2016-06-29 22:30:31 -04:00
protected_branch.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
release.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
repository.rb Document Repository#keep_around 2016-07-04 00:11:33 -04:00
security_event.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
sent_notification.rb Don't garbage collect commits that have related DB records like comments 2016-07-04 00:11:33 -04:00
service.rb Added Bugzilla as external issue tracker option 2016-06-29 06:01:54 -04:00
snippet.rb Merge branch 'feature/custom-highlighting' into 'master' 2016-06-28 08:42:42 +00:00
spam_log.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
spam_report.rb
subscription.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
todo.rb Don't garbage collect commits that have related DB records like comments 2016-07-04 00:11:33 -04:00
tree.rb
u2f_registration.rb Add a `U2fRegistrations` table/model. 2016-06-06 12:50:31 +05:30
user.rb Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
users_star_project.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
wiki_page.rb