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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \|	Update badge	Kamil Trzcinski	2015-12-11	1	-2/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Finishing touches	Kamil Trzcinski	2015-12-11	5	-19/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Fix triggers tests	Kamil Trzcinski	2015-12-11	3	-20/+14
\| \| \| \| \| \|
\| * \| \| \| \|	Rename columns and rename migrations	Kamil Trzcinski	2015-12-11	6	-3/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Reimplement Trigger API	Kamil Trzcinski	2015-12-11	6	-5/+140
\| \| \| \| \| \|
\| * \| \| \| \|	Remove ci_ prefix from all ci related things	Kamil Trzcinski	2015-12-11	33	-267/+269
\| \| \| \| \| \|
\| * \| \| \| \|	Add runners token	Kamil Trzcinski	2015-12-11	12	-29/+23
\| \| \| \| \| \|
\| * \| \| \| \|	Migrate CI::Project to Project	Kamil Trzcinski	2015-12-11	161	-2660/+972
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'ci-services-migrate' into 'master'	Kamil Trzciński	2015-12-14	76	-1742/+756
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ci Services migrate See merge request !1985
\| * \| \| \| \|	Fix migrations [ci skip]	Kamil Trzcinski	2015-12-14	4	-10/+19
\| \|/ / / /
\| * \| \| \|	Fix indentation and BuildsEmailServiceci-services-migrate	Kamil Trzcinski	2015-12-11	2	-6/+5
\| \| \| \| \|
\| * \| \| \|	Change default values	Kamil Trzcinski	2015-12-11	5	-11/+29
\| \| \| \| \|
\| * \| \| \|	Enhance migrate CI emails	Kamil Trzcinski	2015-12-11	1	-4/+23
\| \| \| \| \|
\| * \| \| \|	Fix issue tracker service	Kamil Trzcinski	2015-12-10	1	-11/+7
\| \| \| \| \|
\| * \| \| \|	Fix specs	Kamil Trzcinski	2015-12-10	5	-11/+12
\| \| \| \| \|
\| * \| \| \|	Migrate SlackService and HipChat service	Kamil Trzcinski	2015-12-10	7	-1/+72
\| \| \| \| \|
\| * \| \| \|	Migrate CI WebHooks and Emails to new tables	Kamil Trzcinski	2015-12-10	6	-6/+55
\| \| \| \| \|
\| * \| \| \|	Migrate CI::Services and CI::WebHooks to Services and WebHooks	Kamil Trzcinski	2015-12-10	73	-1750/+602
\| \| \| \| \|
* \| \| \| \|	Merge branch 'use-gitlab-workhorse-in-doc' into 'master'	Stan Hu	2015-12-14	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename mention of gitlab-git-http-server to gitlab-workhorse [ci skip] Closes https://github.com/gitlabhq/gitlabhq/issues/9904 See merge request !2092
\| * \| \| \| \|	Rename mention of gitlab-git-http-server to gitlab-workhorse	Stan Hu	2015-12-14	1	-1/+1
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Closes https://github.com/gitlabhq/gitlabhq/issues/9904
* \| \| \| \|	Merge branch 'improve_emoji'	Valery Sizov	2015-12-14	2	-1/+21
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Add hover-state for emoji in emoji-pickerimprove_emoji	Valery Sizov	2015-12-11	2	-1/+21
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'fix-shared-runner-wording' into 'master'	Robert Speicher	2015-12-12	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix wording on "runners" page An attempt to be a bit more specific and clear on the "runners" page. [ci skip] See merge request !2066
\| * \| \| \|	Fix wording on runner setup page	Pelle	2015-12-12	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'requires-redis-2.6' into 'master'	Gabriel Mazetto	2015-12-12	4	-5/+22
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump Redis requirement to 2.8 for Sidekiq 4 GitLab Omnibus already uses Redis 2.8. There is also a plan to upgrade to Sidekiq 4, which needs Redis 2.8. Closes #3649 See merge request !1888
\| * \| \| \| \|	Bump Redis requirement to 2.8 for Sidekiq 4 requirements	Stan Hu	2015-12-12	4	-5/+22
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #3649 [ci skip]
* \| \| \| \|	Merge branch 'custom-saml-button-label' into 'master'	Achilleas Pipinellis	2015-12-12	1	-2/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add details on how to change saml button label Instructions on how to customize SAML login button text. See merge request !2079
\| * \| \| \| \|	add details on how to change saml button label	Ben Bodenmiller	2015-12-11	1	-2/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Stan Hu	2015-12-11	1	-0/+3
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge branch 'clarify_ci_caching' into 'master'	Achilleas Pipinellis	2015-12-11	1	-0/+3
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify cache behavior After chatting with @ayufan about CI caching, I added some info to the documentation. This should make it clear how caching currently works. cc/ @ayufan Is this accurate? See merge request !2072
\| \| * \| \| \| \|	Clarify cache behavior	Drew Blessing	2015-12-11	1	-0/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #9839 from huacnlee/fix/add-author-info-into-note-messages	Stan Hu	2015-12-11	1	-0/+2
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Make sure notify email always has author info.
\| * \| \| \| \| \|	Make sure notify email always has author info.	Jason Lee	2015-11-18	1	-0/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'ui-right-sidebar' into 'master'	Dmitriy Zaporozhets	2015-12-11	20	-298/+364
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement new sidebar for issue and merge request pages This is first step in implementing #3981. We don't have new dropdowns yet so I used some workarounds. Also I did it from linux machine without having access to design materials. So some colors/paddings might not match - but I will improve it with next iteration. cc @creamzy @JobV See merge request !2058
\| * \| \| \| \| \| \|	Fix tests	Dmitriy Zaporozhets	2015-12-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Move awards back to gray panel and few improvements to sidebar	Dmitriy Zaporozhets	2015-12-11	7	-6/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Few UI improvements to new sidebar implementation	Dmitriy Zaporozhets	2015-12-11	3	-8/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Fix tests for new issuable sidebar	Dmitriy Zaporozhets	2015-12-11	2	-14/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Update changelog	Dmitriy Zaporozhets	2015-12-11	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Implement new sidebar for merge request page	Dmitriy Zaporozhets	2015-12-11	10	-92/+82
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Make edit link on issuable sidebar works	Dmitriy Zaporozhets	2015-12-11	1	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Redesign issue page for new sidebar	Dmitriy Zaporozhets	2015-12-11	6	-198/+97
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Move awards css to separate file	Dmitriy Zaporozhets	2015-12-11	1	-0/+68
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Implement issuable sidebar partial	Dmitriy Zaporozhets	2015-12-11	1	-0/+80
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'fix-typo' into 'master'	Robert Speicher	2015-12-11	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo [ci skip] See merge request !2035
\| * \| \| \| \| \| \|	Fix typo	Zeger-Jan van de Weg	2015-12-10	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Update CHANGELOG	Robert Speicher	2015-12-11	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch 'mr-statuses' into 'master'	Robert Speicher	2015-12-11	6	-1/+59
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display referenced merge request statuses in the issue description See gitlab-org/gitlab-ce#3180 for original issue. Previously discussed in !1941 and in !1771 before that. * [x] Show a "Related Merge Requests" list on the issue page under the Description as given by the UI mockup * [x] Display `all_references.merge_requests` and `note.all_references.merge_requests` * [x] Consider displaying the merge request status in addition to the CI status to enable complete merge request status understanding. See merge request !1991
\| * \| \| \| \| \| \| \|	display referenced merge requests in issue description with CI statusgsmethells/gitlab-ce-mr-statuses	Greg Smethells	2015-12-11	6	-1/+59
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'revert-2037' into 'master'	Dmitriy Zaporozhets	2015-12-11	4	-2/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert removal of RedCloth Revert !2037. See merge request !2071