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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \|	Revert "Note: add default_scope { order(created_at: :asc, id: :asc) }"	Dmitriy Zaporozhets	2015-03-18	1	-1/+0
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 7602cef572fd770a06eb3d94f2aef57c2693dcb6.
* \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-03-18	1	-0/+1
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge branch 'api-sort-merge-request-comments' into 'master'	Douwe Maan	2015-03-18	1	-0/+1
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Api: sort merge_request comments Add default_scope { order(created_at: :asc, id: :asc) } in Note so comments are sorted when fetched through api. See merge request !256
\| \| * \| \| \| \| \|	Note: add default_scope { order(created_at: :asc, id: :asc) }	Samuel Bernard	2015-03-18	1	-0/+1
\| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-mr-push-range' into 'master'	Dmitriy Zaporozhets	2015-03-18	2	-3/+7
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix condensed range in MR push comment. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/1246 In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/326#note_984907, you see that the compare page doesn't actually have 39 commits because we're using `first_new_commit^`, which is not always the same as `oldrev`. With this MR, we use `oldrev` instead, which will always work. See merge request !1721
\| * \| \| \| \| \|	Fix condensed range in MR push comment.	Douwe Maan	2015-03-18	2	-3/+7
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'changelog-link' into 'master'	Dmitriy Zaporozhets	2015-03-18	7	-41/+106
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add changelog, license and contribution guide links to project sidebar. If the version is known, the "Version: 7.9.0pre" button links to the changelog, otherwise a "View changelog" button is shown. ![Screen_Shot_2015-03-18_at_14.22.29](https://dev.gitlab.org/gitlab/gitlabhq/uploads/747acc018ec9a188098e0f0bc4e91cc3/Screen_Shot_2015-03-18_at_14.22.29.png) See merge request !1708
\| * \| \| \| \| \| \|	Add license and contribution guide links to project sidebar.	Douwe Maan	2015-03-18	6	-17/+65
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Show changelog link even if no version is known.	Douwe Maan	2015-03-18	1	-3/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix tree readme.	Douwe Maan	2015-03-18	1	-4/+10
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Link project version to changelog if there is one.	Douwe Maan	2015-03-18	2	-2/+10
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Find tree readme lazily.	Douwe Maan	2015-03-18	1	-20/+19
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Move finding of contributing file from tree to repository.	Douwe Maan	2015-03-18	2	-7/+7
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'bump-gitlab-git' into 'master'	Dmitriy Zaporozhets	2015-03-18	2	-3/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump gitlab_git to 7.1.2 For https://dev.gitlab.org/gitlab/gitlabhq/issues/2151 See merge request !1722
\| * \| \| \| \| \| \|	Bump gitlab_git to 7.1.2	Dmitriy Zaporozhets	2015-03-18	2	-3/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'new-branch-commits' into 'master'	Dmitriy Zaporozhets	2015-03-18	5	-12/+18
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	List new commits for newly pushed branch in activity view. When someone pushes commits, I want to see them, regardless if it's a new or existing branch. If it's a new branch, we compare with the default branch (usually master). ![Screen_Shot_2015-03-17_at_15.49.13](https://dev.gitlab.org/gitlab/gitlabhq/uploads/4cb7e0d833bc83a30197db81d4b273bc/Screen_Shot_2015-03-17_at_15.49.13.png) See merge request !1711
\| * \| \| \| \| \| \|	List new commits for newly pushed branch in activity view.	Douwe Maan	2015-03-18	5	-12/+18
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-03-18	16	-59/+204
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'commit_calendar_activity' into 'master'	Douwe Maan	2015-03-18	14	-39/+202
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extend commit calendar to actually show what commits were made on a date ## What does this MR do? This MR extends the commit calendar so it acutally shows what commits were made on a date and in which project. It is based on the optimizations @dzaporozhets made for the calendar. ## Are there points in the code the reviewer needs to double check? The UI and how the links are generated i guess. That feels hacky at the moment :/ ## Screenshot: ![commit_calendar_extend_display](https://gitlab.com/uploads/gitlab-org/gitlab-ce/5bf1631660/commit_calendar_extend_display.png) I assume that i have to refactor this a bit more to make it a cleaner implementation, so please give me feedback on what needs to be changed :) See merge request !326
\| \| * \| \| \| \| \|	Extend the commit calendar to show the actual commits for a date	Hannes Rosenögger	2015-03-18	14	-39/+202
\| \| \|/ / / / /
\| * \| \| \| \| \|	Merge branch 'line_wrap_default' into 'master'	Douwe Maan	2015-03-18	3	-20/+2
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable line wrapping per default. This MR enables line wrapping by default and removes the checkbox to toggle it. Let's be honest, noone likes horizontal scrollbars. /cc @dzaporozhets @DouweM As discussed yesterday. Please take a look. Did I miss something? The change feels to easy :smile: See merge request !396
\| \| * \| \| \| \|	enable line wrapping by default and remove the checkbox to change it	Hannes Rosenögger	2015-03-18	3	-20/+2
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'order_in_settings_page' into 'master'	Dmitriy Zaporozhets	2015-03-18	1	-2/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the order of signin and signup on features page. See merge request !1720
\| * \| \| \| \|	Fix the order of signin and signup on features page.	Marin Jankovski	2015-03-18	1	-2/+2
\|/ / / / /
* \| \| \| \|	Merge branch 'fix_subscription' into 'master'	Dmitriy Zaporozhets	2015-03-18	2	-26/+28
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix public issue See merge request !1717
\| * \| \| \| \|	fix public issue	Valery Sizov	2015-03-18	2	-26/+28
\| \| \| \| \| \|
* \| \| \| \| \|	Fix external wiki service	Dmitriy Zaporozhets	2015-03-17	2	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'refactor-css'	Dmitriy Zaporozhets	2015-03-17	6	-769/+20
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Remove to old GitLab colors for succes and primary	Dmitriy Zaporozhets	2015-03-17	3	-10/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Cleanup bootstrap variable example filerefactor-css	Dmitriy Zaporozhets	2015-03-17	1	-741/+4
\| \| \| \| \| \|
\| * \| \| \| \|	More use of sass variables. Reject flatly gray colors	Dmitriy Zaporozhets	2015-03-17	5	-24/+17
\|/ / / / /
* \| \| \| \|	Align services like in EE for easier merging	Dmitriy Zaporozhets	2015-03-17	1	-4/+22
\| \| \| \| \|
* \| \| \| \|	Move CHANGELOG item to correct milestone	Dmitriy Zaporozhets	2015-03-17	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'external_wiki' into 'master'	Dmitriy Zaporozhets	2015-03-18	7	-2/+102
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for external wikis ## What does this MR do? This MR adds the possibility to replace the link to the internal wiki of gitlab with a custom link. Currently this is realised as a service. ## What Use Case does this MR solve? In my Company we already have a wiki System (Confluence). We have a policy to use the existing wiki, so we can't switch to the internal wiki Gitlab provides. This currently only leaves us two choices: 1. Disable the gitlab wiki. That means we completly loose the connection between wiki and code from the gitlab ui. 2. Create a simple wiki page with a link to our external wiki and hope that no one uses the internal one. Both solutions are not really good. So what can be done to improve the situation while making it as easy as possible for new developers to access both, wiki and gitlab? Replacing the wiki link kinda like the JIRA integration replaces the issues link looks like a good first step to me. :) This can probably be extended later to completly prevent access to the internal wiki (currently that's still possible if you know the link) or maybe to check if the link really points to a wiki. ## Screenshot: ![external_wiki_service](https://gitlab.com/uploads/gitlab-org/gitlab-ce/89b27cf068/external_wiki_service.png) See merge request !291
\| * \| \| \| \|	Add a service to support external wikis	Hannes Rosenögger	2015-03-12	7	-2/+102
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-03-17	2	-2/+2
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge branch 'replace-linux-with-gnu-linux' into 'master'	Dmitriy Zaporozhets	2015-03-18	2	-2/+2
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace linux with gnu linux To recognize the work of Dr. Stallman. See merge request !391
\| \| * \| \| \| \| \|	Replace linux with GNU/Linux to recognize the work of Dr. Stallman.replace-linux-with-gnu-linux	Sytse Sijbrandij	2015-03-15	2	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix email template css for project moved emails	Dmitriy Zaporozhets	2015-03-17	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'css-vars' into 'master'	Dmitriy Zaporozhets	2015-03-18	10	-31/+31
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More actively use css variabled to prevent colors duplication See merge request !1715
\| * \| \| \| \| \| \|	More actively use css variabled to prevent colors duplication	Dmitriy Zaporozhets	2015-03-17	10	-31/+31
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix scroll for last push widget	Dmitriy Zaporozhets	2015-03-17	1	-1/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'update-grack' into 'master'	Dmitriy Zaporozhets	2015-03-18	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Grack. See merge request !1712
\| * \| \| \| \| \| \| \|	Update Grack.	Douwe Maan	2015-03-17	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'update-omniauth-ldap' into 'master'	Dmitriy Zaporozhets	2015-03-18	2	-5/+5
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update omniauth-ldap. See merge request !1713
\| * \| \| \| \| \| \| \|	Update omniauth-ldap.	Douwe Maan	2015-03-17	2	-5/+5
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Its time for 7.10.0.pre	Dmitriy Zaporozhets	2015-03-17	2	-1/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'update_install_documentation' into 'master'	Marin Jankovski	2015-03-17	4	-21/+24
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update installation and upgrade documentation See merge request !1714
\| * \| \| \| \| \| \| \|	Update upgrade and installation docs for 7.9.	Marin Jankovski	2015-03-17	2	-15/+18
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'fix_service_trigger_ui' into 'master'	Douwe Maan	2015-03-17	2	-6/+6
\| \|\ \ \ \ \ \ \ \ \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix service UI There was a small bug in the service UI that caused an empty 'Trigger' label to be shown. After this change the 'Trigger' field is not shown when only one event type of supported. Before: ![Screen Shot 2015-03-16 at 7.40.31 PM](https://gitlab.com/uploads/dblessing/gitlab-ce/0457a0b918/Screen_Shot_2015-03-16_at_7.40.31_PM.png) I think in the future there are other things we can do to enforce at least one selected event type and also show the user what the singular event type is if only one is supported. That will take time to work out and this is definitely acceptable for the time. See merge request !395