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

	Commit message (Collapse)	Author	Age	Files	Lines
*	changes titlessorting-dropdown-order	Jacob Schatz	2016-01-07	2	-8/+8
\|
*	Merge branch 'ajax-filter-commits' into 'master'	Dmitriy Zaporozhets	2016-01-07	9	-70/+87
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ajax filter commits Fixes #3509 ![Screenshot_2016-01-06_13.07.53](/uploads/7400d855d8207e37e3c0ec09cb2265e9/Screenshot_2016-01-06_13.07.53.png) See merge request !2314
\| *	Use fadeTo instead of cssajax-filter-commits	Dmitriy Zaporozhets	2016-01-07	1	-5/+2
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Fix typo in js method and some repeating css	Dmitriy Zaporozhets	2016-01-07	3	-7/+16
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Add support for ref and path to commits filtering	Dmitriy Zaporozhets	2016-01-07	3	-11/+14
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Prevent loading first 20 commits twice	Dmitriy Zaporozhets	2016-01-07	1	-3/+3
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Add CHANGELOG item and tests	Dmitriy Zaporozhets	2016-01-07	3	-0/+15
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Add ajax filtering for commits list	Dmitriy Zaporozhets	2016-01-07	2	-46/+31
\| \| \| \| \| \| \| \| \| \| \| \|	Also handle commits list with Pager class to prevent code duplication Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Add search field to commits page	Dmitriy Zaporozhets	2016-01-07	2	-13/+15
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Filter commits by search parameter	Dmitriy Zaporozhets	2016-01-07	1	-2/+8
\|/ \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'remove-more-influxdb-tags' into 'master'	Yorick Peterse	2016-01-07	4	-10/+23
\|\ \| \| \| \|	See merge request !2328
\| *	Store request methods/URIs as values	Yorick Peterse	2016-01-07	4	-6/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since filtering by these values is very rare (they're mostly just displayed as-is) we don't need to waste any index space by saving them as tags. By storing them as values we also greatly reduce the number of series in InfluxDB.
\| *	Removed UUIDs from metrics transactions	Yorick Peterse	2016-01-07	2	-5/+3
\| \| \| \| \| \| \| \| \| \|	While useful for finding out what methods/views belong to a transaction this might result in too much data being stored in InfluxDB.
* \|	Merge branch 'find-file-credit' into 'master'	Douwe Maan	2016-01-07	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Credit koreamic for creating Find File See merge request !2327
\| * \|	Credit koreamic for creating Find File	Douwe Maan	2016-01-07	1	-1/+1
\| \| \|
* \| \|	Merge branch 'use-sudo-with-incorrect-base-permissions' into 'master'	Dmitriy Zaporozhets	2016-01-07	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Suggest prefacing find command with sudo when base permissions are wrong Closes #5872 See merge request !2299
\| * \| \|	Suggest prefacing find command with sudo when base permissions are wrong	Stan Hu	2016-01-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #5872
* \| \| \|	Merge branch 'fix-missing-day-in-network-graph' into 'master'	Dmitriy Zaporozhets	2016-01-07	2	-1/+2
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix missing date of month in network graph when commits span a month Closes #3635, #1383 Before: ![image](/uploads/6a169e0cd402cb26f3a2cf13bd0ecc88/image.png) After: ![image](/uploads/2600a454394383660a1e50a4a1ba1204/image.png) See merge request !2325
\| * \| \|	Fix missing date of month in network graph when commits span a month	Stan Hu	2016-01-06	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #3635, #1383
* \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Jacob Vosmaer	2016-01-07	0	-0/+0
\|\ \ \ \
\| * \ \ \	Merge pull request #9889 from koreamic/file_finder	Douwe Maan	2016-01-07	25	-9/+473
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add new feature to find file(recreate)
\| \| * \| \| \|	Add new feature to find file	koreamic	2016-01-07	25	-9/+473
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using the fuzzy filter, develop "file finder" feature. - feedback(http://feedback.gitlab.com/forums/176466-general/suggestions/4987909-add-file-finder-fuzzy-input-in-files-tab-to-ju ) - fuzzy filter(https://github.com/jeancroy/fuzzaldrin-plus) - shortcuts(when "t" was hitted at tree view, go to 'file find' page and 'esc' is to go back) - depends on gitlab_git 7.2.22
* \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Jacob Vosmaer	2016-01-07	25	-9/+473
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Merge branch 'revert-influxdb-milliseconds' into 'master'	Yorick Peterse	2016-01-07	4	-14/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	See merge request !2326
\| * \| \| \|	Revert "Store SQL/view timings in milliseconds"	Yorick Peterse	2016-01-07	4	-14/+6
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 7549102bb727daecc51da84af39956b32fc41537. Apparently I was wrong about ActiveSupport::Notifications::Event#duration returning the duration in seconds, instead it returns it in milliseconds already.
* \| \| \|	Merge branch 'doc_enable_disable_ci' into 'master'	Achilleas Pipinellis	2016-01-07	4	-0/+72
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation on enabling/disabling GitLab CI Closes #4289 See merge request !2320
\| * \| \| \|	Fix hyphenation typos [ci skip]	Achilleas Pipinellis	2016-01-07	1	-7/+7
\| \| \| \| \|
\| * \| \| \|	Add documentation on enabling/disabling GitLab CIdoc_enable_disable_ci	Achilleas Pipinellis	2016-01-06	4	-0/+72
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge branch 'remove-influxdb-credentials' into 'master'	Yorick Peterse	2016-01-07	5	-26/+16
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|	See merge request !2319
\| * \| \| \|	Remove InfluxDB username/passwordremove-influxdb-credentials	Yorick Peterse	2016-01-06	5	-26/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	InfluxDB over UDP doesn't use authentication, thus there's no need for these settings.
* \| \| \| \|	Merge branch 'more-opengraph' into 'master'	Robert Speicher	2016-01-06	7	-76/+40
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Open Graph data for group, project and commit. See merge request !2211
\| * \ \ \ \	Merge branch 'master' into more-opengraphmore-opengraph	Douwe Maan	2016-01-06	15	-60/+251
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Don't override issue page description in project layout.	Douwe Maan	2016-01-06	5	-14/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove now-redundant `page_description` call from Groups#show	Robert Speicher	2016-01-05	1	-2/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove now-redundant `page_description` call from Projects#show	Robert Speicher	2016-01-05	1	-3/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Make `page_description` less magical :sparkles:	Robert Speicher	2016-01-05	4	-42/+11
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Use `User#avatar_url` instead of `avatar_icon` helper	Robert Speicher	2016-01-05	2	-41/+20
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' into more-opengraph	Douwe Maan	2016-01-05	174	-1610/+3219
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/views/layouts/_head.html.haml
\| * \| \| \| \| \| \|	Use `assign` instead of `instance_variable_set`	Robert Speicher	2015-12-27	1	-7/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add specs for page_image using a Group's avatar	Robert Speicher	2015-12-27	1	-0/+16
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add Open Graph data for group, project and commit.	Douwe Maan	2015-12-25	5	-6/+14
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'merge-when-build-succeeds-unchecked' into 'master'	Robert Speicher	2016-01-06	5	-8/+15
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Get "Merge when build succeeds" to work when commits were pushed to MR target branch while builds were running The Merge when build succeeds service only merges when the MR is mergeable (open, not WIP, no conflicts). When the target branch is updated, all affected MRs have their merge status set to `unchecked`, and the conflicts check will only happen when `check_if_can_be_merged` is called, which happens when the MR page is viewed. When someone enables the automatic merge, the target branch is updated, no-one views the MR page again, and the build succeeds, the mergeability check will fail and the MR will not in fact be merged. This MR makes sure `check_if_can_be_merged` is always called when MR mergeability is checked. See merge request !2304
\| * \ \ \ \ \ \ \	Merge branch 'master' into merge-when-build-succeeds-uncheckedmerge-when-build-succeeds-unchecked	Douwe Maan	2016-01-06	15	-60/+251
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Get "Merge when build succeeds" to work when commits were pushed to MR ↵	Douwe Maan	2016-01-05	5	-8/+15
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	target branch while builds were running
* \| \| \| \| \| \| \|	Merge branch 'rs-issue-1697' into 'master'	Douwe Maan	2016-01-06	1	-0/+16
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Define a limited set of filters for SingleLinePipeline Removes the following filters from its parent GfmPipeline: - SyntaxHighlightFilter - UploadLinkFilter - TableOfContentsFilter - LabelReferenceFilter - TaskListFilter Closes #1697 See merge request !2257
\| * \| \| \| \| \| \| \|	Define a limited set of filters for SingleLinePipeliners-issue-1697	Robert Speicher	2016-01-05	1	-0/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes the following filters from its parent GfmPipeline: - SyntaxHighlightFilter - UploadLinkFilter - TableOfContentsFilter - LabelReferenceFilter - TaskListFilter Closes #1697
* \| \| \| \| \| \| \| \|	Merge branch 'fix-banzai-cache' into 'master'	Robert Speicher	2016-01-06	3	-17/+24
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix mentionable reference extraction caching. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4130 Reverts https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2120 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2283 See merge request !2315
\| * \| \| \| \| \| \| \|	Add regression test.fix-banzai-cache	Douwe Maan	2016-01-06	1	-1/+14
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix mentionable reference extraction caching.	Douwe Maan	2016-01-06	1	-2/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Revert "Temporarily disable Markdown caching"	Douwe Maan	2016-01-06	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit d337d5e7137d9b3fd0f9b8890a3ba9296323acc7.