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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Added indexes for notes.line_code and CI columns	Yorick Peterse	2015-10-16	3	-1/+21
\| \| \| \| \| \| \| \| \| \|	This adds indexes for the following columns: * notes.line_code * ci_projects.gitlab_id * ci_projects.shared_runners_enabled * ci_builds.type * ci_builds.status
*	Merge branch 'gitlab-git-http-server-version' into 'master'	Robert Speicher	2015-10-16	3	-0/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Track compatible gitlab-git-http-server version The 'git archive' changes in GitLab 8.1 require a version of gitlab-git-http-server that is incompatible with GitLab 8.0, so we need to keep track of this now. See merge request !1603
\| *	Track compatible gitlab-git-http-server versiongitlab-git-http-server-version	Jacob Vosmaer	2015-10-15	3	-0/+3
\| \|
* \|	Merge branch 'improve-typography' into 'master'	Dmitriy Zaporozhets	2015-10-16	1	-41/+35
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve typography See merge request !1622
\| * \|	Improve markdown typography scss	Dmitriy Zaporozhets	2015-10-16	1	-41/+35
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'fix-wiki-padding' into 'master'	Dmitriy Zaporozhets	2015-10-16	3	-2/+8
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dont put padding on typography but on holder elements instead Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes wrong padding of wiki content. cc @JobV @skyruler See merge request !1620
\| * \|	Add extra padding to some markdown pages	Dmitriy Zaporozhets	2015-10-16	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Dont put padding on typography but on holder elements instead	Dmitriy Zaporozhets	2015-10-16	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'compact-select' into 'master'	Dmitriy Zaporozhets	2015-10-16	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make selectbox options more compact Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1619
\| * \| \|	Increase dropdown padding a bit	Dmitriy Zaporozhets	2015-10-16	1	-2/+2
\| \| \| \|
\| * \| \|	Make selectbox options more compact	Dmitriy Zaporozhets	2015-10-16	1	-1/+1
\| \|/ / \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'comment-highlight' into 'master'	Dmitriy Zaporozhets	2015-10-16	2	-0/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Highlight comment based on anchor in URL Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fix for #2954 See merge request !1618
\| * \| \|	Highlight comment based on anchor in URL	Dmitriy Zaporozhets	2015-10-16	2	-0/+5
\| \|/ / \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'ci-commits-gl-project-id-index' into 'master'	Yorick Peterse	2015-10-16	2	-1/+7
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add index on ci_commits.gl_project_id See merge request !1616
\| * \|	Add index on ci_commits.gl_project_idci-commits-gl-project-id-index	Yorick Peterse	2015-10-16	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes #3086
* \| \|	Merge branch 'last-commit-project-page' into 'master'	Dmitriy Zaporozhets	2015-10-16	7	-0/+68
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show last commit from default branch on project home page Implements #2705 Screenshot: ![Screenshot_2015-10-15_19.03.29](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ef1cfa6764ab0ec5e7584ae61980a47d/Screenshot_2015-10-15_19.03.29.png) Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @skyruler See merge request !1610
\| * \|	Change order of sha and commit message on project home page	Dmitriy Zaporozhets	2015-10-16	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Add changelog itemlast-commit-project-page	Dmitriy Zaporozhets	2015-10-16	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Add tests for last commit info on project home page	Dmitriy Zaporozhets	2015-10-16	3	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Show last commit from default branch on project home page	Dmitriy Zaporozhets	2015-10-15	4	-0/+50
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'notify-mr-upon-branch-presence-change' into 'master'	Douwe Maan	2015-10-16	9	-19/+127
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a system note and update relevant merge requests when a branch is deleted or re-added If a branch is deleted with an open merge request, amended offline, and then pushed again, GitLab doesn't bother to update the merge request even though the last commit ID and/or code may have changed. This MR ensures that each push will update any relevant merge requests and adds a system note if this happens as well. The new messages look like: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6581eea069cd8e485b7fa4187ed4c043/image.png) Closes #2926 See merge request !1601
\| * \| \|	Reorder system note verb to say "Restored source branch X" instead of ↵	Stan Hu	2015-10-16	3	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"Source branch X restored"
\| * \| \|	Add spec for refresh service adding notes to restored branches	Stan Hu	2015-10-16	3	-16/+17
\| \| \| \|
\| * \| \|	Rubocop fix	Stan Hu	2015-10-15	1	-1/+1
\| \| \| \|
\| * \| \|	Add system notes for restored branches	Stan Hu	2015-10-15	2	-5/+29
\| \| \| \|
\| * \| \|	Memoize merge request source branches	Stan Hu	2015-10-15	1	-8/+9
\| \| \| \|
\| * \| \|	Improve SystemNote interface for branch add/restore case	Stan Hu	2015-10-15	4	-15/+19
\| \| \| \|
\| * \| \|	Preserve target branch	Stan Hu	2015-10-15	1	-1/+5
\| \| \| \|
\| * \| \|	Add a system note and update relevant merge requests when a branch is ↵	Stan Hu	2015-10-15	8	-24/+98
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	deleted or re-added If a branch is deleted with an open merge request, amended offline, and then pushed again, GitLab doesn't bother to update the merge request even though the last commit ID and/or code may have changed. This MR ensures that each push will update any relevant merge requests and adds a system note if this happens as well. Closes #2926
* \| \|	Merge pull request #9740 from ashleyhindle/patch-1	Stan Hu	2015-10-15	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Changed loose to lose
\| * \| \|	Changed loose to lose	Ashley Hindle	2015-10-16	1	-1/+1
\|/ / /
* \| \|	Merge branch 'when-syntax' into 'master'	Robert Speicher	2015-10-16	10	-126/+283
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement when syntax in .gitlab-ci.yml See merge request !1606
\| * \| \|	Correct spec description typo	Robert Speicher	2015-10-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \|	Update CI YAML docswhen-syntax	Robert Speicher	2015-10-15	1	-4/+5
\| \| \| \|
\| * \| \|	Shut up, Rubocop	Robert Speicher	2015-10-15	1	-1/+1
\| \| \| \|
\| * \| \|	Backticks around when types	Kamil Trzcinski	2015-10-15	1	-1/+1
\| \| \| \|
\| * \| \|	Fix specs	Kamil Trzcinski	2015-10-15	3	-5/+6
\| \| \| \|
\| * \| \|	Implement when syntax in .gitlab-ci.yml	Kamil Trzcinski	2015-10-15	10	-124/+279
\| \| \| \|
* \| \| \|	Remove 8.0-only steps from the 8.1 update guide	Robert Speicher	2015-10-15	1	-89/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also adds a preamble note that a working 8.0 installation (i.e., gitlab-git-http-server, updated Nginx/Apache configs) is required before proceeding. [ci skip]
* \| \| \|	Remove notes about CI migration from 8.1 update guide	Robert Speicher	2015-10-15	1	-10/+3
\|/ / / \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'sentences-end-in-periods' into 'master'	Robert Speicher	2015-10-15	1	-1/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sentences end in periods. [ci skip] See merge request !1604
\| * \| \|	Sentences end in periods.sentences-end-in-periods	Douwe Maan	2015-10-15	1	-1/+2
\| \| \| \|
* \| \| \|	Merge branch 'rs-prepare-8-1-0' into 'master'	Robert Speicher	2015-10-15	2	-2/+230
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prepare 8.1 documentation [ci skip] See merge request !1612
\| * \| \| \|	Add 8.0-to-8.1 update guide	Robert Speicher	2015-10-15	1	-0/+228
\| \| \| \| \|
\| * \| \| \|	Update Installation doc for 8-1-stable	Robert Speicher	2015-10-15	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'update-redcarpet' into 'master'	Robert Speicher	2015-10-15	2	-3/+3
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update redcarpet gem. Fixes gem memory leak Fixes #2773 See merge request !1607
\| * \| \| \|	Update redcarpet gem. Fixes gem memory leakupdate-redcarpet	Dmitriy Zaporozhets	2015-10-15	2	-3/+3
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'build-view-ui-fixes' into 'master'	Kamil Trzciński	2015-10-15	3	-6/+7
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Build View UI fixes See merge request !1608
\| * \| \|	Added missing comma [ci skip]	Kamil Trzcinski	2015-10-15	1	-1/+1
\| \| \| \|
\| * \| \|	Make the builds view and warning notice nicer	Kamil Trzcinski	2015-10-15	3	-6/+7
\|/ / /