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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Use gitlab-shell 2.6.9gitlab-shell-2.6.9	Jacob Vosmaer	2015-12-17	2	-2/+2
\|
*	Merge branch 'gitlab-workhorse-0.5.1' into 'master'	Robert Speicher	2015-12-17	3	-3/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Use gitlab-workhorse 0.5.1 Improves relative URL support. See merge request !2134
\| *	Use gitlab-workhorse 0.5.1gitlab-workhorse-0.5.1	Jacob Vosmaer	2015-12-17	3	-3/+3
\| \|
* \|	Merge branch 'issue_4131' into 'master'	Robert Speicher	2015-12-17	4	-8/+9
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Upgrade Poltergeist to 1.8.1. Close #4131 See merge request !2126
\| *	Upgrade Poltergeist to 1.8.1. #4131issue_4131	Rubén Dávila	2015-12-17	4	-8/+9
\| \|
* \|	Merge branch 'fix-migration' into 'master'	Kamil Trzciński	2015-12-17	1	-1/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix ci_projects migration by using the value only from latest row [ci skip] This is needed, because for some projects we have duplicate ci_projects. This was introduced by lack of DB uniqueness on ci_projects.gitlab_id. The MR fixes edge case by selecting value from latest. /cc @yorickpeterse Fixes: gitlab-org/gitlab-ce#4123 See merge request !2133
\| * \|	Fix ci_projects migration by using the value only from latest row [ci skip]	Kamil Trzcinski	2015-12-17	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is needed, because for some projects we have duplicate ci_projects. This was introduced by lack of DB uniqueness on ci_projects.gitlab_id.
* \| \|	Merge branch 'revert-sidebar' into 'master'	Dmitriy Zaporozhets	2015-12-17	8	-108/+93
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert sidebar position for issue and merge request Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @creamzy @skyruler See merge request !2132
\| * \|	Revert sidebar position for issue and merge request	Dmitriy Zaporozhets	2015-12-17	8	-108/+93
\|/ / \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'ux/closed-message' into 'master'	Dmitriy Zaporozhets	2015-12-17	4	-9/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix ux issue with "This issue will be closed automatically" message 1. Make a nice box for "issue will be closed automatically" message 2. move it below emoji navbar. Otherwise looks wierd. Fixes #4134 # Before ![Screenshot_2015-12-17_00.01.03](/uploads/2a24de77f76ce8a8b61ebabd3a02c83a/Screenshot_2015-12-17_00.01.03.png) # After ![Screenshot_2015-12-17_00.03.08](/uploads/ccd21b87b7509e79773fabd179bef4aa/Screenshot_2015-12-17_00.03.08.png) Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2129
\| * \|	Fix ux issue with "This issue will be closed automatically" messageux/closed-message	Dmitriy Zaporozhets	2015-12-17	4	-9/+4
\| \|/ \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'doc_private_registry' into 'master'	Achilleas Pipinellis	2015-12-17	1	-2/+21
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Add info on using private Docker registries in CI See merge request !2130
\| *	Add info on using private Docker registries in CI [ci skip]	Achilleas Pipinellis	2015-12-17	1	-2/+21
\| \|
* \|	Merge branch 'api-support-starred-projects' into 'master'	Dmitriy Zaporozhets	2015-12-16	4	-1/+47
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Api support for requesting starred projects for user Closes #4112 Note: probably targets the wrong release in the `CHANGELOG`, though 8.4 was not there yet See merge request !2127
\| * \|	Api support for requesting starred projects for user	Zeger-Jan van de Weg	2015-12-16	4	-1/+47
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes #4112
* \| \|	Merge branch 'move-mr-builds-tab' into 'master'	Dmitriy Zaporozhets	2015-12-16	2	-11/+11
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move MR Builds tab next to Commits Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/4132 @dzaporozhets We've got two people who feel strongly about this now, @sytses filed an issue for it :) ![Screen_Shot_2015-12-16_at_22.19.35](/uploads/37e705610ba54e386928d7972398c247/Screen_Shot_2015-12-16_at_22.19.35.png) See merge request !2128
\| * \| \|	Move MR Builds tab next to Commits	Douwe Maan	2015-12-16	2	-11/+11
\| \|/ /
* \| \|	Merge branch 'fix-merge-immediately-button' into 'master'	Robert Speicher	2015-12-16	2	-16/+14
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix updating and disabling merge button when Merge Immediately is clicked Fixes #4128 See merge request !2124
\| * \| \|	Fix merge widget JS for buttonsfix-merge-immediately-button	Douwe Maan	2015-12-16	1	-10/+8
\| \| \| \|
\| * \| \|	Merge branch 'master' into fix-merge-immediately-button	Douwe Maan	2015-12-16	6	-56/+33
\| \|\ \ \
\| * \| \| \|	Fix updating and disabling merge button when Merge Immediately is clicked	Douwe Maan	2015-12-16	2	-7/+7
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix_rubocop' into 'master'	Robert Speicher	2015-12-16	1	-1/+1
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Rubocop complain. See merge request !2125
\| * \| \| \|	Fix Rubocop complain.fix_rubocop	Rubén Dávila	2015-12-16	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'yaml-ci-cleanup' into 'master'	Achilleas Pipinellis	2015-12-16	1	-133/+212
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up ci yaml doc * Fix headings so that they are picked up by doc.gitlab.com * Stick to 80 characters * Clean up some examples See merge request !2052
\| * \| \| \|	Clean up ci yaml doc [ci skip]yaml-ci-cleanup	Achilleas Pipinellis	2015-12-16	1	-133/+212
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Fix headings so that they are picked up by doc.gitlab.com * Stick to 80 characters * Clean up some examples
* \| \| \|	Merge branch 'feature/remove-celluloid' into 'master'	Dmitriy Zaporozhets	2015-12-16	2	-26/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update rerun to remove celluloid as dependency After sidekiq 4 migration, we no longer need celluloid. `rerun` recent version also removed it from its dependency, so by getting this MR merged, we can solve #3797 See merge request !2088
\| * \| \| \|	Update rerun to remove celluloid as dependencyfeature/remove-celluloid	Gabriel Mazetto	2015-12-13	2	-26/+5
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-12-16	2	-5/+7
\|\ \ \ \ \
\| * \ \ \ \	Merge branch 'mr-builds-fixes' into 'master'	Dmitriy Zaporozhets	2015-12-16	1	-4/+4
\| \|\ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link to correct (source) project on MR builds tab Used to link to `gitlab-org/gitlab-ce/commits/<branch-name>`, now links to correct project. See merge request !2115
\| \| * \| \| \|	Link to correct (source) project on MR builds tabmr-builds-fixes	Douwe Maan	2015-12-16	1	-4/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'disable-markdown-cache' into 'master'	Douwe Maan	2015-12-16	1	-1/+3
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Temporarily disable Markdown caching See merge request !2120
\| \| * \| \| \| \|	Temporarily disable Markdown caching	Douwe Maan	2015-12-16	1	-1/+3
\| \| \|/ / / /
* \| \| \| \| \|	Merge remote-tracking branch 'origin/rs-simplify-status-icon'	Dmitriy Zaporozhets	2015-12-16	3	-26/+24
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Define CI status icon colors in SCSS instead of a helperrs-simplify-status-icon	Robert Speicher	2015-12-12	3	-26/+24
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'fix-milestone-snippet-header' into 'master'	Dmitriy Zaporozhets	2015-12-16	23	-182/+186
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix headers of milestone and snippet show pages Fix layout, and move "Edit" button to very right just like issue/MR. Before: ![Screen_Shot_2015-12-15_at_17.33.20](/uploads/dbbeb6868b80e21894159126a0feca6a/Screen_Shot_2015-12-15_at_17.33.20.png) ![Screen_Shot_2015-12-15_at_17.33.28](/uploads/53d10b42adc34e48b063889120e9a746/Screen_Shot_2015-12-15_at_17.33.28.png) After: ![Screen_Shot_2015-12-15_at_17.34.25](/uploads/b0d0ea3f6a7b61d51b474419207f7a02/Screen_Shot_2015-12-15_at_17.34.25.png) ![Screen_Shot_2015-12-15_at_17.35.55](/uploads/65b922f5249655d3733740690577c9d7/Screen_Shot_2015-12-15_at_17.35.55.png) cc @skyruler cc @rspeicher 8.3 please! See merge request !2104
\| * \| \| \| \|	Fix specfix-milestone-snippet-header	Douwe Maan	2015-12-16	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Rename .issuable-details to .detail-page (and -header and -description)	Douwe Maan	2015-12-16	22	-188/+188
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' into fix-milestone-snippet-header	Douwe Maan	2015-12-16	168	-1002/+1005
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| * \| \| \| \|	Fix tests	Douwe Maan	2015-12-16	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Move milestone edit button to the very right	Douwe Maan	2015-12-15	1	-4/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Fix headers of milestone and snippet show pages	Douwe Maan	2015-12-15	4	-12/+16
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'reference-cache' into 'master'	Robert Speicher	2015-12-16	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only cache markdown when object has been saved and has a proper cache_key. See merge request !2119
\| * \| \| \| \| \|	Only cache markdown when object has been saved and has a proper cache_key.	Douwe Maan	2015-12-16	1	-1/+1
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-merge-immediately' into 'master'	Robert Speicher	2015-12-16	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 'Merge Immediately' button Fixes #4125 See merge request !2117
\| * \| \| \| \|	Fix 'Merge Immediately' buttonfix-merge-immediately	Douwe Maan	2015-12-16	1	-1/+1
\| \|/ / / /
* \| \| \| \|	Merge branch 'fix-bad-merge' into 'master'	Douwe Maan	2015-12-16	1	-1/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bad merge /cc: @dzaporozhets See merge request !2116
\| * \| \| \| \|	Fix bad merge	Stan Hu	2015-12-16	1	-1/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-endpoint-not-setting-var' into 'master'	Douwe Maan	2015-12-16	1	-6/+3
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix endpoint not setting needed @ci_commit /cc @DouweM See merge request !2112
\| * \| \| \| \|	Fix endpoint not setting needed @ci_commit	Zeger-Jan van de Weg	2015-12-16	1	-6/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'control-list-right-margin' into 'master'	Dmitriy Zaporozhets	2015-12-16	1	-1/+5
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix right margin of control list Before: ![Screen_Shot_2015-12-16_at_16.29.39](/uploads/7a6aa79b6af0900d9257ce86ab822a22/Screen_Shot_2015-12-16_at_16.29.39.png) After: ![Screen_Shot_2015-12-16_at_16.29.45](/uploads/d52fdc70ecd63fc61ae6ae87b3b7d1a5/Screen_Shot_2015-12-16_at_16.29.45.png) See merge request !2114