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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add tests for clicking a row in build artifacts browserci/test-build-artifacts-scripts	Grzegorz Bizon	2016-01-22	2	-0/+19
\|
*	Merge branch 'issue/spelling' into 'master'	Achilleas Pipinellis	2016-01-22	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a missing letter in the documentation. Hello, I just found a missing letter in the PHP CI configuration documentation. This MR allow to fix that :smile: See merge request !2519
\| *	Fix a missing letter in the documentation.	Stéphane HULARD	2016-01-20	1	-1/+1
\| \|
* \|	Merge branch 'fix-mr-diff-edit-button' into 'master'	Robert Speicher	2016-01-22	4	-29/+27
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix MR diff 'Edit' button It now works and has the right size. See merge request !2542
\| * \|	Fix MR diff 'Edit' buttonfix-mr-diff-edit-button	Douwe Maan	2016-01-21	4	-29/+27
\| \| \|
* \| \|	Merge branch 'fix-diff-comments' into 'master'	Robert Speicher	2016-01-22	3	-6/+10
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More highlighted diff fixes See merge request !2545
\| * \| \|	Properly highlight right side of parallel difffix-diff-comments	Douwe Maan	2016-01-22	1	-1/+3
\| \| \| \|
\| * \| \|	Restore diff comments	Douwe Maan	2016-01-22	2	-5/+7
\| \|/ /
* \| \|	Merge branch 'file_finder_doc_fixes' into 'master'	Achilleas Pipinellis	2016-01-22	1	-6/+7
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix grammar and typos in file finder docs See merge request !2547
\| * \| \|	Fix grammar and typos in file finder docs	Achilleas Pipinellis	2016-01-22	1	-6/+7
\|/ / / \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'unescaped-diffs' into 'master'	Robert Speicher	2016-01-22	3	-8/+20
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure non-highlighted diffs are still escaped Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12521 See merge request !2544
\| * \| \|	Fix	Douwe Maan	2016-01-22	1	-2/+2
\| \| \| \|
\| * \| \|	Make sure non-highlighted diffs are still escapedunescaped-diffs	Douwe Maan	2016-01-22	3	-8/+20
\| \|/ /
* \| \|	Merge branch 'fix_file_finder' into 'master'	Achilleas Pipinellis	2016-01-21	1	-5/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	File finder can be invoked from anywhere! See merge request !2543
\| * \| \|	File finder can be invoked from anywhere!	Achilleas Pipinellis	2016-01-22	1	-5/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Merge branch 'ci/recursive-artifacts-entries' into 'master'	Robert Speicher	2016-01-21	7	-19/+46
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add method to calculate total size of artifacts in subpath See merge request !2500
\| * \| \| \|	Add method that calculates total size for artifacts subfolderci/recursive-artifacts-entries	Kamil Trzcinski	2016-01-20	7	-19/+46
\| \| \| \| \|
* \| \| \| \|	Merge branch 'diff-highlight-themes' into 'master'	Robert Speicher	2016-01-21	21	-268/+237
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Diff highlight themes Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12484 See merge request !2530
\| * \| \| \|	Make dark inline diffs a little more obviousdiff-highlight-themes	Douwe Maan	2016-01-21	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Pretty highlighted diffs for every theme	Douwe Maan	2016-01-21	5	-20/+37
\| \| \| \| \|
\| * \| \| \|	Use consistent markup and styling for highlighting across blobs, diffs, ↵	Douwe Maan	2016-01-21	21	-260/+212
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	blame and snippets
* \| \| \| \|	Merge branch 'housekeeping-doc' into 'master'	Achilleas Pipinellis	2016-01-21	3	-0/+23
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add housekeeping feature documentation Add documentation about the new housekeeping feature in the project settings page. See merge request !2371
\| * \| \| \| \|	Refactor housekeeping documentation	Achilleas Pipinellis	2016-01-21	2	-6/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \|	Merge branch 'master' into housekeeping-doc	Achilleas Pipinellis	2016-01-21	535	-2472/+9542
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge branch 'file_finder' into 'master'	Achilleas Pipinellis	2016-01-21	4	-0/+43
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add file finder documentation Closes #7966 See merge request !2541
\| * \| \| \| \|	Add file finder documentation	Achilleas Pipinellis	2016-01-21	4	-0/+43
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge branch 'drag-drop-cursor' into 'master'	Jacob Schatz	2016-01-21	1	-0/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Milestone drag & drop cursor Fixes #4097 ![grab-cursor](/uploads/f5071d7e4839c3b4b88c9f7f1270eee3/grab-cursor.gif) cc @jschatz1 @creamzy See merge request !2532
\| * \| \| \| \|	Milestone drag & drop cursor	Phil Hughes	2016-01-21	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #4097
* \| \| \| \| \|	Merge branch 'ci/build-artifacts-documentation' into 'master'	Achilleas Pipinellis	2016-01-21	5	-0/+175
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add basic documentation for build artifacts /cc @axil @ayufan See merge request !2511
\| * \| \| \| \| \|	Refactor build artifacts documentationci/build-artifacts-documentation	Achilleas Pipinellis	2016-01-21	6	-52/+175
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \|	Add basic documentation for build artifacts	Grzegorz Bizon	2016-01-20	3	-0/+52
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'doc_restart_gitlab' into 'master'	Achilleas Pipinellis	2016-01-21	3	-0/+164
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation on restarting GitLab This will save as time from writing the same commands over and over again. See merge request !2510
\| * \| \| \| \| \| \|	Fix typos, make things more clear	Achilleas Pipinellis	2016-01-21	1	-18/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \|	Link to restart_gitlab.md and some more fixesdoc_restart_gitlab	Achilleas Pipinellis	2016-01-20	1	-3/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \|	Add document on restarting GitLab	Achilleas Pipinellis	2016-01-20	3	-0/+150
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \|	Merge branch 'fix/artifacts-download-progress-bar' into 'master'	Grzegorz Bizon	2016-01-21	3	-10/+17
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not use progress bar when downloading build artifacts Closes #12491 See merge request !2531
\| * \| \| \| \| \| \|	Move build artifacts javascripts into separate filefix/artifacts-download-progress-bar	Grzegorz Bizon	2016-01-21	3	-13/+16
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Do not use progress bar when downloading build artifacts	Grzegorz Bizon	2016-01-21	1	-1/+5
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #12491
* \| \| \| \| \| \|	Merge branch 'fix-permissions' into 'master'	Robert Speicher	2016-01-21	26	-0/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove execution permissions from font assets [ci skip] See merge request !2082
\| * \| \| \| \| \| \|	remove execution permissions from fonts	Pirate Praveen	2016-01-21	25	-0/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	add execution permission for script	Pirate Praveen	2016-01-21	1	-0/+0
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'workhorse-path' into 'master'	Robert Speicher	2016-01-21	4	-9/+12
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Init script changes for gitlab-workhorse in 8.4 Goes with https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/31 Also bumps gitlab-workhorse to 0.6.1. [ci skip] See merge request !2529
\| * \| \| \| \| \| \|	Use gitlab-workhorse 0.6.1workhorse-path	Jacob Vosmaer	2016-01-21	2	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Mention init script update	Jacob Vosmaer	2016-01-21	1	-4/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Init script changes for gitlab-workhorse in 8.4	Jacob Vosmaer	2016-01-21	2	-3/+9
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix-github-wiki-import' into 'master'	Douwe Maan	2016-01-21	1	-2/+6
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix import of GitHub's wiki when the repository has not been created Fixes #12503 See merge request !2533
\| * \| \| \| \| \| \|	Fix import of GitHub's wiki when the repository has not been created	Douglas Barbosa Alexandre	2016-01-21	1	-2/+6
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'instrument-gitlab-git-repository' into 'master'	Douwe Maan	2016-01-21	1	-0/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instrument Gitlab::Git::Repository See merge request !2528
\| * \| \| \| \| \| \|	Instrument Gitlab::Git::Repository	Yorick Peterse	2016-01-21	1	-0/+1
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds instrumentation for the instance methods of Gitlab::Git::Repository.
* \| \| \| \| \| \|	Merge branch 'ci/cache-key' into 'master'	Douwe Maan	2016-01-21	4	-8/+86
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added cache:key to .gitlab-ci.yml allowing to fine tune the caching The `cache:key` allows you to define the affinity mask of caching, allowing to have single cache for all jobs, or cache per-job, or per-branch, or any other way you would need: 1. Cache per-build for all branches: ``` cache: key: "$CI_BUILD_NAME" untracked: true ``` 2. Cache per-branch for all jobs: ``` cache: key: "$CI_BUILD_REF" untracked: true ``` /cc @DouweM @grzesiek @axil See merge request !2436