delta/gitlab/gitlab-ce.git/app/assets/javascripts/blob, branch patch-23 gitlab.com: gitlab-org/gitlab-ce.git Fix conflict in app/assets/javascripts/blob/viewer/index.js 2017-06-08T10:06:08+00:00 Sean McGivern sean@gitlab.com 2017-06-08T10:06:08+00:00 03742e2908996567d8bc4e5f40cdb807c9f59726 






Merge branch '33048-markdown-rendering-of-md-files-has-ceased-to-display-latex-equations' into 'master'
2017-06-08T09:50:00+00:00

Douwe Maan
douwe@gitlab.com

2017-05-30T13:27:57+00:00

33c9cf20d1accf5ab89bcbe58a4ce6d1a59ed97a

Fix math rendering on blob pages

Closes #33048

See merge request !11793

Conflicts:
	app/assets/javascripts/blob/viewer/index.js





Fix math rendering on blob pages

Closes #33048

See merge request !11793

Conflicts:
	app/assets/javascripts/blob/viewer/index.js







Merge branch '9-2-stable-fix-conflicts-for-mr-11427' into '9-2-stable'
2017-05-19T14:16:48+00:00

Douwe Maan
douwe@gitlab.com

2017-05-19T14:16:48+00:00

73f4df1d6238b3b5b9ea214143918cd0b84b2b8a

Fix 9.2 conflicts for "Scroll to anchor when blob content is loaded"

See merge request !11484




Fix 9.2 conflicts for "Scroll to anchor when blob content is loaded"

See merge request !11484






Fixed merging conflict on the blob load viewer
2017-05-19T13:13:20+00:00

Tim Zallmann
tzallmann@gitlab.com

2017-05-19T12:02:18+00:00

16c37592835dbd62ef47a7f149a3fe391611ea91












Merge branch 'disable-clicking-disabled-clipboard-button' into 'master'
2017-05-19T05:03:31+00:00

Phil Hughes
me@iamphill.com

2017-05-18T20:53:16+00:00

af81730b5a47e1e2df5c0877160d9ca991963adc

Fix clicking disabled clipboard button toolip

Closes #32518

See merge request !11493




Fix clicking disabled clipboard button toolip

Closes #32518

See merge request !11493






Merge branch 'dm-scroll-to-blob-user-content' into 'master'
2017-05-18T14:12:40+00:00

Douwe Maan
douwe@gitlab.com

2017-05-17T13:43:07+00:00

4619901632ddb6f2881897e95aa69028c2e6632a

Scroll to anchor when blob content is loaded

See merge request !11427

Conflicts:
	app/assets/javascripts/blob/viewer/index.js





Scroll to anchor when blob content is loaded

See merge request !11427

Conflicts:
	app/assets/javascripts/blob/viewer/index.js







Merge branch 'mia_backort' into 'master'

2017-05-05T19:17:28+00:00

Jacob Schatz
jschatz@gitlab.com

2017-05-05T19:17:28+00:00

aa874a1cd6fc94f6291a59fb414f3b09b3337c0d


Backport of Multiple Assignees feature

See merge request !11089





Backport of Multiple Assignees feature

See merge request !11089






Fix specs
2017-05-05T03:34:15+00:00

Clement Ho
ClemMakesApps@gmail.com

2017-05-04T20:55:36+00:00

c4094b7ec4699811f928699ad67c90e1686da6e2












Backport of multiple_assignees_feature [ci skip]
2017-05-04T14:11:53+00:00

Valery Sizov
valery@gitlab.com

2017-05-04T12:11:15+00:00

387c4b2c21a44360386a9b8ce6849e7f1b8a3de9












Merge branch 'master' into 'balsalmiq-support'
2017-05-02T09:11:55+00:00

Luke "Jared" Bennett
lbennett@gitlab.com

2017-05-02T09:11:55+00:00

ef7001c9c641c1e77ae203650efc0d9aa71a2e3e

# Conflicts:
#   spec/features/projects/commit/cherry_pick_spec.rb
#   spec/features/projects/environments/environment_spec.rb




# Conflicts:
#   spec/features/projects/commit/cherry_pick_spec.rb
#   spec/features/projects/environments/environment_spec.rb