delta/gitlab/gitlab-ce.git/spec/views/projects, branch bugfix/upgrade-ruby-parser gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'dm-collapsed-blob' into 'master' 2017-06-01T09:10:53+00:00 Sean McGivern sean@mcgivern.me.uk 2017-06-01T09:10:53+00:00 04251829ba135a8bab845e9e49d8475eb0211e86 Consistent diff and blob size limit names See merge request !11776 
Consistent diff and blob size limit names

See merge request !11776
 Consistent diff and blob size limit names 2017-05-29T22:02:02+00:00 Douwe Maan douwe@selenight.nl 2017-05-26T23:27:30+00:00 aed0387f97ec62b184da90bdca0ce40f9dc58b45 






Merge remote-tracking branch 'upstream/master' into rename-builds-controller
2017-05-18T07:33:52+00:00

Lin Jen-Shin
godfat@godfat.org

2017-05-18T07:33:52+00:00

54a8cbddb16338bf48aa04143566ccd33646d769

* upstream/master: (31 commits)
  Remove 'no changes' entries from changelog
  Check if OLD is set when migrating issue assignees
  Fix data migration from trigger schedules
  Replace EFS section in AWS guide
  Add warning about AWS EFS and performance
  Consolidate opening text from about.gitlab.com and add active/passive note
  Fix invalid object reference in ee_compat_check script
  Fix Ordered Task List Items
  Add auxiliary viewer for README
  Update fe_guide testing.md
  Add auxiliary blob viewer for CHANGELOG
  Add spec for last commit info when browsing repository files
  Show last commit for current tree on tree page
  Use same last commit widget on project homepage and tree view
  Fix unassigned checkmark
  Add missing changelog for iPython notebook rendering feature
  Convert fa-history to svg; tweak alignment
  Get rid of pluck in app/services/members/authorized_destroy_service.rb
  Removes duplicate environment variable in documentation
  Fixed spacing issues in issue sidebar
  ...





* upstream/master: (31 commits)
  Remove 'no changes' entries from changelog
  Check if OLD is set when migrating issue assignees
  Fix data migration from trigger schedules
  Replace EFS section in AWS guide
  Add warning about AWS EFS and performance
  Consolidate opening text from about.gitlab.com and add active/passive note
  Fix invalid object reference in ee_compat_check script
  Fix Ordered Task List Items
  Add auxiliary viewer for README
  Update fe_guide testing.md
  Add auxiliary blob viewer for CHANGELOG
  Add spec for last commit info when browsing repository files
  Show last commit for current tree on tree page
  Use same last commit widget on project homepage and tree view
  Fix unassigned checkmark
  Add missing changelog for iPython notebook rendering feature
  Convert fa-history to svg; tweak alignment
  Get rid of pluck in app/services/members/authorized_destroy_service.rb
  Removes duplicate environment variable in documentation
  Fixed spacing issues in issue sidebar
  ...







Show last commit for current tree on tree page
2017-05-17T17:59:26+00:00

Douwe Maan
douwe@selenight.nl

2017-05-17T14:23:00+00:00

d3b24a7638de71ee1286200978e0b6d0b33d0753












Use same last commit widget on project homepage and tree view
2017-05-17T15:57:40+00:00

Douwe Maan
douwe@selenight.nl

2017-05-16T23:44:54+00:00

c5a13781fad254e1984cf03f5487350e60f665e5












Rename BuildsController to JobsController
2017-05-17T12:17:30+00:00

Lin Jen-Shin
godfat@godfat.org

2017-05-16T11:41:15+00:00

71777a4a184945d6b58170af55d9fd9fef821ac9

Rename other URL generators

admin_builds_path -> admin_jobs_path

Fix tests and more renaming

Fix more tests

Also change build_id to job_id in the controller





Rename other URL generators

admin_builds_path -> admin_jobs_path

Fix tests and more renaming

Fix more tests

Also change build_id to job_id in the controller







Rename BlobViewer max_size to overridable_max_size and absolute_max_size to max_size
2017-05-15T15:03:34+00:00

Douwe Maan
douwe@selenight.nl

2017-05-15T15:03:34+00:00

b0a163208c1b428fc9f5adad6489f8a3ab884a2b












Specify explicitly whether a blob viewer should be loaded asynchronously
2017-05-13T16:46:10+00:00

Douwe Maan
douwe@selenight.nl

2017-05-12T19:43:06+00:00

acffc062133e5793ac08b9529ab54689557766d4












Implement auxiliary blob viewers
2017-05-11T01:07:04+00:00

Douwe Maan
douwe@selenight.nl

2017-05-08T23:50:23+00:00

08706f683725dcfbda1708ddf079347d989fbef1












Merge branch 'retried-in-database-mysql' into 'master'

2017-05-10T22:07:05+00:00

Regis Boudinot
boudinot.regis@yahoo.com

2017-05-10T22:07:05+00:00

81df0034f4b66f2627ecd92f0ca44b7a3a634719


Retried in database

Closes #25737

See merge request !11115





Retried in database

Closes #25737

See merge request !11115