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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Refer to Apache templates in 8.0 update guidereference-apache-templates-8.0	Jacob Vosmaer	2015-09-24	1	-0/+2
\|
*	Merge branch 'remove-ci-dashboard' into 'master'	Douwe Maan	2015-09-24	10	-96/+9
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove CI dashboard With CI status integrated at GitLab projects page there is no reason to keep it anymore. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Part of #2594 See merge request !1422
\| *	Remove CI dashboard	Dmitriy Zaporozhets	2015-09-24	10	-96/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	With CI status integrated at GitLab projects page there is no reason to keep it anymore. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'ci-status-projects-page' into 'master'	Dmitriy Zaporozhets	2015-09-24	9	-10/+39
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show CI status on Your projects page and Starred projects page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Part of #2594 Screenshot: ![Screenshot_2015-09-24_13.42.52](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0516ea02b72457a431bd72d3f6619dfe/Screenshot_2015-09-24_13.42.52.png) See merge request !1420
\| *	Show CI status on Your projects page and Starred projects pageci-status-projects-page	Dmitriy Zaporozhets	2015-09-24	9	-10/+39
\|/ \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'fix-markdown-preview-font' into 'master'	Dmitriy Zaporozhets	2015-09-24	2	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Use standard Markdown font in Markdown preview instead of fixed-width font Closes #2585 See merge request !1414
\| *	Use standard Markdown font in Markdown preview instead of fixed-width font	Stan Hu	2015-09-23	2	-1/+1
\| \| \| \| \| \| \| \|	Closes #2585
* \|	Merge branch 'build-status-on-commit-page' into 'master'	Dmitriy Zaporozhets	2015-09-24	7	-34/+61
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Build status on commit page Screenshot: ![Screenshot_2015-09-24_11.29.54](https://gitlab.com/gitlab-org/gitlab-ce/uploads/49d1b9dc60d328dceaf771b5e44726ca/Screenshot_2015-09-24_11.29.54.png) Part of #2594 See merge request !1418
\| * \|	Show CI status on commit pagebuild-status-on-commit-page	Dmitriy Zaporozhets	2015-09-24	3	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Show CI status on commit page	Dmitriy Zaporozhets	2015-09-24	2	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Refactor ci-status badge css	Dmitriy Zaporozhets	2015-09-24	2	-34/+37
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'remove-routes-helper' into 'master'	Dmitriy Zaporozhets	2015-09-24	5	-39/+16
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Slack notification URL and remove the usage of Ci::RoutesHelper Fix for #2644 /cc @dzaporozhets @rspeicher See merge request !1391
\| * \|	Fix GitlabCiService specsremove-routes-helper	Kamil Trzcinski	2015-09-22	1	-2/+2
\| \| \|
\| * \|	Fix CI	Kamil Trzcinski	2015-09-22	1	-0/+2
\| \| \|
\| * \|	Fix Slack notification URL and remove the usage of Ci::RoutesHelper	Kamil Trzcinski	2015-09-22	4	-37/+12
\| \| \|
* \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-09-24	21	-91/+151
\|\ \ \
\| * \ \	Merge branch 'move-ci-charts' into 'master'	Dmitriy Zaporozhets	2015-09-24	16	-69/+78
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move CI charts to project graphs area Part of #2594 Should be merged after !1405 Same page but moved to another place ![Screenshot_2015-09-23_16.25.15](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ef7266de0528bd6dd3f95159e161ea9a/Screenshot_2015-09-23_16.25.15.png) See merge request !1407
\| \| * \| \|	Check for CI enabled in correct place	Dmitriy Zaporozhets	2015-09-24	2	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Add header for ci graphs and check that it is enabled	Dmitriy Zaporozhets	2015-09-24	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Merge branch 'master' into move-ci-charts	Dmitriy Zaporozhets	2015-09-24	20	-91/+160
\| \| \|\ \ \
\| \| * \| \| \|	Update CHANGELOGmove-ci-charts	Dmitriy Zaporozhets	2015-09-23	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \|	Move CI charts to project graphs area	Dmitriy Zaporozhets	2015-09-23	14	-69/+69
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Merge branch 'rs-help-page' into 'master'	Douwe Maan	2015-09-24	3	-21/+52
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Help page improvements - Only signed-in users can see version information - Add "Community Edition" text so the header is less barren when version information is hidden - Minor copy edits - Make all "Quick help" link text the entire body of the link. Prior, it wasn't obvious which part of each item was an actual link. Closes #2721 See merge request !1415
\| \| * \| \| \| \|	Allow non-admin users to see version informationrs-help-page	Robert Speicher	2015-09-23	2	-19/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We want users to know what features they have available (and to pressure their admins to upgrade).
\| \| * \| \| \| \|	Move the `version_check_enabled` check from view to helper	Robert Speicher	2015-09-23	3	-5/+3
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add a view spec (gasp!) for help/index	Robert Speicher	2015-09-23	1	-0/+55
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add "Community Edition" to the version info on the help page	Robert Speicher	2015-09-23	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If the version information was hidden because the user was not an admin, the "GitLab" text looked lonely. This also brings us more in line with EE which shows "Enterprise Edition".
\| \| * \| \| \| \|	"fine grained" -> "fine-grained"	Robert Speicher	2015-09-23	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Make all "Quick help" link text the entire body of the link	Robert Speicher	2015-09-23	1	-16/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prior, it wasn't obvious which parts of each item was an actual link.
\| \| * \| \| \| \|	Only surface version information on help index to admins	Robert Speicher	2015-09-23	1	-4/+5
\| \| \| \|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2721
\| * \| \| \| \|	Merge branch 'fix-network-graph-refs' into 'master'	Douwe Maan	2015-09-24	3	-1/+21
\| \|\ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove git refs used internally by GitLab from network graph GitLab 8.0 removed satellites and started using git refs that began with `refs/merge-requests/XXX` and `refs/tmp/XXX`, which showed up in an ugly way in the network graph: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/150eb7ae5f07f0d4793589b5eac462db/image.png) Closes #2702 See merge request !1410
\| \| * \| \| \|	Remove git refs used internally by GitLab from network graph	Stan Hu	2015-09-23	3	-1/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2702
* \| \| \| \| \|	Merge branch 'sshpage-fix' into 'master'	Job van der Voort	2015-09-24	2	-18/+14
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Made some steps to add SSH keys more clear See merge request !1936
\| * \| \| \| \|	fixed step to instructions	karen Carias	2015-09-23	1	-13/+13
\| \| \| \| \| \|
\| * \| \| \| \|	fixed step to instructions	karen Carias	2015-09-23	1	-5/+1
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'cleanup-ci-dashboard' into 'master'	Douwe Maan	2015-09-24	8	-219/+47
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cleanup ci dashboard Part of #2594. Based on !1403 * remove rendering GitLab projects with not enabled CI on CI dashboard * remove enabling CI for projects from CI dashboard (now its done by simply pushing `.gitlab-ci.yml`) * simplify the projects query for CI dashboard See merge request !1405
\| * \| \| \|	Remove test for non existing functionalitycleanup-ci-dashboard	Dmitriy Zaporozhets	2015-09-23	1	-50/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Remove non-existing page	Dmitriy Zaporozhets	2015-09-23	1	-5/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Fix search for ci projects and cleanup unnecessary code	Dmitriy Zaporozhets	2015-09-23	2	-13/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Simplify CI projects query	Dmitriy Zaporozhets	2015-09-23	4	-50/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Show only enabled CI projects	Dmitriy Zaporozhets	2015-09-23	5	-109/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since CI is enabled by pushing .gitlab-ci.yml file there is no need to add CI project via dashboard Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'pagination-last-page' into 'master'	Hannes Rosenögger	2015-09-23	7	-7/+15
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pagination last page First commit adds a link to the last page.![Screenshot_from_2015-09-17_20-29-00](https://gitlab.com/zj/gitlab-ce/uploads/dcd4f97b8b75c6725ed2a71ba86057b4/Screenshot_from_2015-09-17_20-29-00.png) Unless there are less than 5 pages to show.![Screenshot_from_2015-09-17_20-34-31](https://gitlab.com/zj/gitlab-ce/uploads/2d730ad11306abcfa83c69627d4f6a7d/Screenshot_from_2015-09-17_20-34-31.png) Also updates the `Kaminari` gem to the latest version, which is a minor update. [Changelog](https://github.com/amatsuda/kaminari/blob/master/CHANGELOG.rdoc) See merge request !1334
\| * \| \| \|	Fix styling conform the new style	Zeger-Jan van de Weg	2015-09-23	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add my name to the right page of the changelog
\| * \| \| \|	Add links to first and/or last page with kaminari	Zeger-Jan van de Weg	2015-09-23	6	-7/+14
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Also update Kaminari gem to the latest version
* \| \| \|	Merge branch 'rs-changelog' into 'master'	Robert Speicher	2015-09-23	1	-2/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update CHANGELOG to add unreleased 8.0.2 entry [ci skip] See merge request !1413
\| * \| \| \|	Update CHANGELOG to add unreleased 8.0.2 entry	Robert Speicher	2015-09-23	1	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge branch 'fix-ldap-attributes' into 'master'	Robert Speicher	2015-09-23	2	-7/+8
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix LDAP attribute mapping See merge request !1408
\| * \| \| \|	Fix LDAP attribute mappingfix-ldap-attributes	Douwe Maan	2015-09-23	2	-7/+8
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-markdown-truncation-removing-links' into 'master'	Robert Speicher	2015-09-23	3	-1/+22
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix cases where Markdown did not render links in activity feed HTML would be stripped in `truncate_if_block` when a comment had multiple lines and the first wasn't long enough to be truncated. The use of `node.content` would strip all HTML tags. Using `node.inner_html` retains these tags and puts the "..." in between paragraph tags. Closes #2586 See merge request !1401
\| * \| \| \| \|	Fix cases where Markdown did not render links in activity feed	Stan Hu	2015-09-22	3	-1/+22
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	HTML would be stripped in `truncate_if_block` when a comment had multiple lines and the first wasn't long enough to be truncated. The use of `node.content` would strip all HTML tags. Using `node.inner_html` retains these tags and puts the "..." in between paragraph tags. Closes #2586