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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix Rubocop complain.issue_3452	Rubén Dávila	2015-12-16	1	-1/+1
\|
*	Fix broken spec. #3452	Rubén Dávila	2015-12-16	1	-1/+1
\|
*	Add link to MR from Build detail page. #3452	Rubén Dávila	2015-12-16	3	-0/+78
\|
*	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
\| * \|	Fix right margin of control list	Douwe Maan	2015-12-16	1	-1/+5
\| \| \|
* \| \|	Merge branch 'issuable-sidebar' into 'master'	Dmitriy Zaporozhets	2015-12-16	1	-8/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issuable sidebar tweaks - Move cross-project reference down - ~~Fix "Notifications" label color~~ Reverted - ~~Use regularly colored button for "Subscribe"/"Unsubscribe"~~ Reverted Before: ![Screen_Shot_2015-12-15_at_17.38.08](/uploads/d4eeab44bb21fca2fe9ebe620ed9e060/Screen_Shot_2015-12-15_at_17.38.08.png) After: (Only the moved cross-project reference is still relevant, other changes have been reverted) ![Screen_Shot_2015-12-15_at_17.38.23](/uploads/b61aed3a0884c986785a5b09af8dbb25/Screen_Shot_2015-12-15_at_17.38.23.png) cc @skyruler cc @rspeicher 8.3 please! See merge request !2105
\| * \| \|	Revert "Fix "Notifications" label color"	Douwe Maan	2015-12-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit e4e1777aa5e465663e8caf1696d67a0567dd6bc6.
\| * \| \|	Revert "Use regularly colored button for "Subscribe"/"Unsubscribe""	Douwe Maan	2015-12-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit c1db8d15903117964274963b87fcc1893c4ee82c.
\| * \| \|	Use regularly colored button for "Subscribe"/"Unsubscribe"issuable-sidebar	Douwe Maan	2015-12-15	1	-1/+1
\| \| \| \|
\| * \| \|	Fix "Notifications" label color	Douwe Maan	2015-12-15	1	-1/+1
\| \| \| \|
\| * \| \|	Move cross-project reference down	Douwe Maan	2015-12-15	1	-8/+8
\| \| \| \|
* \| \| \|	Merge branch 'fix-border' into 'master'	Dmitriy Zaporozhets	2015-12-16	4	-4/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix double right border in MR discussion Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> # Before ![Screenshot_2015-12-16_15.44.00](/uploads/dd2c85e82fdb784e897cf1a695af1a1e/Screenshot_2015-12-16_15.44.00.png) # After ![Screenshot_2015-12-16_15.43.36](/uploads/b50954e01bb3f45d2df6f43d34a1db60/Screenshot_2015-12-16_15.43.36.png) cc @skyruler See merge request !2113
\| * \| \| \|	Fix double border in MR discussion	Dmitriy Zaporozhets	2015-12-16	4	-4/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-12-16	8	-297/+27
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	Merge branch 'remove-author-from-email' into 'master'	Douwe Maan	2015-12-16	1	-2/+0
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Make sure notify email always has author info." This reverts commit 303f79f8046876c7a461708dee5d1f50f12737bf. See merge request !2103
\| \| * \| \| \|	Revert "Make sure notify email always has author info."remove-author-from-email	Job van der Voort	2015-12-15	1	-2/+0
\| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 303f79f8046876c7a461708dee5d1f50f12737bf.
\| * \| \| \|	Merge branch 'workhorse-passthrough' into 'master'	Kamil Trzciński	2015-12-16	7	-295/+27
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pass all requests from NGINX to gitlab-workhorse See merge request !2073
\| \| * \| \|	Update workhorse version in doc/install/installation.mdworkhorse-passthrough	Robert Speicher	2015-12-15	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Gitlab-workhorse related 8.3 update changes	Jacob Vosmaer	2015-12-15	1	-1/+19
\| \| \| \| \|
\| \| * \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Jacob Vosmaer	2015-12-15	290	-5131/+3393
\| \| \|\ \ \ \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \|	workhorse-passthrough
\| \| * \| \|	Update init script options for gitlab-workhorse	Jacob Vosmaer	2015-12-15	2	-2/+3
\| \| \| \| \|
\| \| * \| \|	Require gitlab-workhorse 0.5.0	Jacob Vosmaer	2015-12-15	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Pass all requests from NGINX to gitlab-workhorse	Jacob Vosmaer	2015-12-11	2	-290/+3
\| \| \| \| \|
* \| \| \| \|	Merge branch 'add-open-issues-count-to-api' of ↵	Dmitriy Zaporozhets	2015-12-16	6	-1/+31
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/stanhu/gitlab-ce Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Add open_issues_count to project API	Stan Hu	2015-12-11	6	-1/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is needed to support Huboard and a generally useful value.
* \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-12-16	5	-13/+11
\|\ \ \ \ \
\| * \ \ \ \	Merge branch 'rs-clipboard-fixes' into 'master'	Douwe Maan	2015-12-16	5	-13/+11
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix clipboard buttons on MR instructions and Commit#show See merge request !2108
\| \| * \| \| \| \|	Fix clipboard buttons on MR instructions and Commit#showrs-clipboard-fixes	Robert Speicher	2015-12-15	4	-11/+11
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Update CHANGELOG	Robert Speicher	2015-12-15	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-12-16	4	-17/+84
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch 'add_svn_2_git_docs' into 'master'	Achilleas Pipinellis	2015-12-16	4	-17/+84
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add SVN to Git migration documentation Document the process of migrating a SVN repository and pushing it to GitLab. cc/ @axil See merge request !2028
\| \| * \| \| \| \| \|	[ci skip] Add SVN to Git migration documentation	Drew Blessing	2015-12-15	4	-17/+84
\| \| \|/ / / / /
* \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-12-16	2	-5/+10
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch 'rs-timeago' into 'master'	Douwe Maan	2015-12-16	2	-5/+10
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix time_ago_with_tooltip for activity feed Closes #4002 See merge request !2074
\| \| * \| \| \| \| \|	Fix time_ago_with_tooltip for activity feedrs-timeago	Robert Speicher	2015-12-11	2	-5/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #4002
* \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-12-16	2	-1/+6
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge branch 'fix-profile-nav' into 'master'	Andrey	2015-12-16	2	-1/+6
\| \|\ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make profile navigation full wide Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> ## Before ![Administrator___GitLab](/uploads/a43e8992264ed78afa732e7a911ef154/Administrator___GitLab.png) ## After ![Administrator___GitLab1](/uploads/9e67e8af071d4879045311abe15a7bba/Administrator___GitLab1.png) See merge request !2076
\| \| * \| \| \| \| \|	Make profile navigation full widefix-profile-nav	Dmitriy Zaporozhets	2015-12-11	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/feature/update-rubocop'	Dmitriy Zaporozhets	2015-12-16	61	-167/+199
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fixed CiServices validationfeature/update-rubocop	Gabriel Mazetto	2015-12-15	2	-4/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Disabled Rails/Date cop	Gabriel Mazetto	2015-12-15	1	-0/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fixed Rubocop offenses	Gabriel Mazetto	2015-12-15	58	-154/+155
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Updated .rubocop.yml to match 0.35.x changes	Gabriel Mazetto	2015-12-14	1	-6/+30
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Updated Rubocop to latest version	Gabriel Mazetto	2015-12-14	2	-7/+8
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'lazy-reference-extractor' into 'master'	Robert Speicher	2015-12-15	84	-495/+546
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move Markdown/reference logic from `Gitlab::Markdown` to `Banzai` - Moves from `Gitlab::Markdown` to `Banzai` - Moves filters and pipelines into their own namespace: `Banzai::Filter` and `Banzai::Pipeline` - No more `autoload`! - Split up `Gitlab::ReferenceExtractor` into `Banzai::ReferenceExtractor` and `Gitlab::ReferenceExtractor` - Replace `something(load_lazy_references: true)` by `Gitlab::ReferenceExtractor.lazily { something }` Goes from: ```ruby def referenced_merge_requests references = [self, notes].flat_map do \|note\| note.all_references(load_lazy_references: false).merge_requests end.uniq! Gitlab::Markdown::ReferenceFilter::LazyReference.load(references).uniq.sort_by(&:iid) end ``` to ```ruby def referenced_merge_requests Gitlab::ReferenceExtractor.lazily do [self, notes].flat_map do \|note\| note.all_references.merge_requests end end.sort_by(&:iid) end ``` See merge request !2027
\| * \| \| \| \| \| \| \|	Use lazy reference extractor to get issue's MRslazy-reference-extractor	Douwe Maan	2015-12-15	2	-6/+6
\| \| \| \| \| \| \| \| \|