delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Use import instead of requirefix-eslint	Clement Ho	2017-05-24	2	-2/+2
\|
*	Merge branch 'mrchrisw-catch-openssl' into 'master'	Douwe Maan	2017-05-24	3	-2/+6
\|\ \| \| \| \| \| \| \| \|	Rescue OpenSSL::SSL::SSLError in JiraService See merge request !11467
\| *	Rescue OpenSSL::SSL::SSLError in JiraService and IssueTrackerServicemrchrisw-catch-openssl	Chris Wilson	2017-05-23	3	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \|	Add OpenSSL::SSL::SSLError to rescue in JiraService & IssueTrackerService. This will prevent an exception in production and instead display a message to the user.
* \|	Merge branch '32702-fix-autocompletion-diff-notes' into 'master'	Phil Hughes	2017-05-24	6	-6/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix user and issues autocomplete in diff notes Closes #32702 See merge request !11627
\| * \|	Fix user and issues autocomplete in diff notes	Kushal Pandya	2017-05-24	6	-6/+6
\|/ /
* \|	Merge branch 'dm-paste-code-inside-gfm-code' into 'master'	Filipa Lacerda	2017-05-24	4	-9/+81
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't wrap pasted code when it's already inside code tags Closes #32507 See merge request !11524
\| * \|	Add specdm-paste-code-inside-gfm-code	Douwe Maan	2017-05-23	2	-6/+55
\| \| \|
\| * \|	Don't wrap pasted code when it's already inside code tags	Douwe Maan	2017-05-19	3	-3/+26
\| \| \|
* \| \|	Merge branch '18927-reorder-issue-action-buttons' into 'master'	Filipa Lacerda	2017-05-24	2	-12/+20
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reorder Issue action buttons as per UX recommendation Closes #18927 See merge request !11642
\| * \| \|	Reorder Issue action buttons as per UX recommendation	Kushal Pandya	2017-05-24	2	-12/+20
\|/ / /
* \| \|	Merge branch '32700-extra-nav-border' into 'master'	Phil Hughes	2017-05-24	1	-11/+11
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only show extra nav border on layout nav Closes #32700 See merge request !11657
\| * \| \|	Only show extra nav border on layout nav32700-extra-nav-border	Annabel Dunstone Gray	2017-05-23	1	-11/+11
\| \| \| \|
* \| \| \|	Merge branch ↵	Phil Hughes	2017-05-24	17	-53/+85
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'32563-remove-duplicated-config-code-for-filtered-search-dropdowns' into 'master' Resolve "Remove duplicated config code for filtered search dropdowns" Closes #32563 See merge request !11512
\| * \| \| \|	Port EE changes32563-remove-duplicated-config-code-for-filtered-search-dropdowns	Clement Ho	2017-05-23	16	-35/+70
\| \| \| \| \|
\| * \| \| \|	Remove duplicated code	Clement Ho	2017-05-18	3	-18/+15
\| \| \| \| \|
* \| \| \| \|	Merge branch '32682-skipped-ci-icon' into 'master'	Phil Hughes	2017-05-24	3	-2/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds new icon for CI skipped status Closes #32682 See merge request !11606
\| * \| \| \| \|	Adds new icon for CI skipped status32682-skipped-ci-icon	Filipa Lacerda	2017-05-22	3	-2/+6
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'sentry-clientside-releases' into 'master'	Phil Hughes	2017-05-24	5	-32/+37
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Read HEAD commit and use as sentry releases value Closes #32535 See merge request !11565
\| * \| \| \| \| \|	Use Gitlab::REVISION over reading HEAD sha from gitsentry-clientside-releases	Luke "Jared" Bennett	2017-05-21	4	-25/+25
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Revert webpack.config.js	Luke "Jared" Bennett	2017-05-21	1	-28/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Read HEAD commit and use as releases value	Luke "Jared" Bennett	2017-05-19	5	-19/+51
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '32835-stop-using-webpack-hashedmoduleidsplugin-in-production' ↵	Tim Zallmann	2017-05-24	1	-4/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Stop using `webpack.HashedModuleIdsPlugin` in production." See merge request !11670
\| * \| \| \| \| \| \|	drop HashedModuleIdsPlugin in favor of NamedModulesPlugin in all environments32835-stop-using-webpack-hashedmoduleidsplugin-in-production	Mike Greiling	2017-05-23	1	-4/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'acet-fix-mr-widget-state' into 'master'	Douwe Maan	2017-05-23	2	-10/+10
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change order of if blocks to determine widget state properly. Closes #32550 See merge request !11668
\| * \| \| \| \| \| \|	MRWidget: Change order of if blocks to determine widget state properly.acet-fix-mr-widget-state	Fatih Acet	2017-05-24	2	-10/+10
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix-notify-post-receive' into 'master'	Stan Hu	2017-05-23	3	-89/+91
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent errors from non-functional notify_post_receive endpoint See merge request !11509
\| * \| \| \| \| \| \| \|	Prevent errors from non-functional notify_post_receive endpointfix-notify-post-receive	Alejandro Rodríguez	2017-05-18	3	-89/+91
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 9.2.1	Clement Ho	2017-05-23	3	-8/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \|	Merge branch '32509-next-run-in-pipeline-schedules-shows-past-time' into ↵	Kamil Trzciński	2017-05-23	2	-2/+3
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Use #real_next_run in pipelines table Closes #32509 See merge request !11660
\| * \| \| \| \| \| \| \|	Test for next_run_at in the view.32509-next-run-in-pipeline-schedules-shows-past-time	Bryce Johnson	2017-05-23	1	-1/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Use real_next_run in pipeline schedule table.	Bryce Johnson	2017-05-23	1	-1/+1
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'update-doc-rm-shell-compile' into 'master'	Stan Hu	2017-05-23	1	-1/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove `bin/comple` from gitlab-shell v5.0.2 deployment procedure. See merge request !11655
\| * \| \| \| \| \| \| \|	Remove `bin/comple` from gitlab-shell v5.0.2 deployment procedure.	Jun Kuriyama	2017-05-24	1	-1/+0
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch '32735-fix-right-sidebar-coming-up-short' into 'master'	Annabel Dunstone Gray	2017-05-23	1	-0/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix right-sidebar gap on mobile Closes #32735 See merge request !11625
\| * \| \| \| \| \| \| \|	Fix sidebar coming up short on mobile32735-fix-right-sidebar-coming-up-short	Eric Eastwood	2017-05-23	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/32735
* \| \| \| \| \| \| \| \|	Merge branch 'issue_32225' into 'master'	Robert Speicher	2017-05-23	13	-52/+50
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add transient head_pipeline_of to pipeline factories See merge request !11566
\| * \| \| \| \| \| \| \| \|	Add transient head_pipeline_of to pipeline factoriesissue_32225	Felipe Artur	2017-05-22	13	-52/+50
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch ↵	Robert Speicher	2017-05-23	2	-6/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'29881-default-project-view-highlighted-tab-when-changing-settings' into 'master' Change ‘Project view’ label to ‘Project home page content’ Closes #29881 See merge request !11650
\| * \| \| \| \| \| \| \| \|	Change ‘Project view’ label to ‘Project home page content’29881-default-project-view-highlighted-tab-when-changing-settings	Pedro Moreira da Silva	2017-05-23	2	-6/+6
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'zj-fix-pipeline-etag' into 'master'	Kamil Trzciński	2017-05-23	9	-1/+104
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix pipeline etag Closes #32658 See merge request !11615
\| * \| \| \| \| \| \| \| \|	Add changelog entry for pipeline etag issue	Z.J. van de Weg	2017-05-23	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	Test the ExpireJobCacheWorker and related changeszj-fix-pipeline-etag	Z.J. van de Weg	2017-05-22	5	-9/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These were untested by the cherry picked commit.
\| * \| \| \| \| \| \| \| \|	Add MISSING e-tag refresh of resource for Job, and Pipeline Graph	Kamil Trzcinski	2017-05-22	3	-0/+47
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add Etag caching for Pipeline#Show action	Z.J. van de Weg	2017-05-22	2	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Due to a typo this was not actually the case. Now that is fixed and performance should improve because of this.
* \| \| \| \| \| \| \| \| \|	Merge branch 'add-unicode-trace-feature-test' into 'master'	Kamil Trzciński	2017-05-23	3	-42/+29
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add feature test with unicode trace See merge request !10736
\| * \| \| \| \| \| \| \| \| \|	Add feature test with unicode traceadd-unicode-trace-feature-test	Shinya Maeda	2017-05-23	3	-42/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Squashed commit of the following: commit 43e5bba774e9e383dd55c665e82f6fcfc4ebfc4f Author: Shinya Maeda <gitlab.shinyamaeda@gmail.com> Date: Mon Apr 17 17:28:44 2017 +0900 Add fix commit 09610eebdf22ad048812bb86022504b2ad917e19 Author: Shinya Maeda <gitlab.shinyamaeda@gmail.com> Date: Mon Apr 17 17:03:49 2017 +0900 Add trace test
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'winh-filters-dropdown-scroll' into 'master'	Annabel Dunstone Gray	2017-05-23	1	-5/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make static filter entries scroll with dynamic ones See merge request !11640
\| * \| \| \| \| \| \| \| \| \| \|	Make static filter entries scroll with dynamic oneswinh-filters-dropdown-scroll	winh	2017-05-23	1	-5/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/rm-superpowers' into 'master'	Sean Packham (GitLab)	2017-05-23	1	-8/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move docs 'superpowers' items to their respective sections See merge request !11646
\| * \| \| \| \| \| \| \| \| \| \|	Move docs 'superpowers' items to respective sectionsdocs/rm-superpowers	Achilleas Pipinellis	2017-05-23	1	-8/+3
\| \| \| \| \| \| \| \| \| \| \| \|