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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Revert "Update noteable after a new note is added"revert_touch	Valery Sizov	2015-08-05	3	-6/+2
\| \| \| \|	This reverts commit fbdaf0e2a517660c0e4e3960f20b2d3568c33e78.
*	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-08-04	2	-2/+5
\|\
\| *	Merge branch 'update-mr-branch-text' into 'master'	Douwe Maan	2015-08-04	1	-2/+4
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update merge request text to reflect editability of source/target branch Screenshot 1 (source branch deleted): ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/81dfbc4c790a1bb047d60cd4699bb71f/image.png) Screenshot 2 (target branch deleted): ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/acec96c12d40175301ce4d4405137348/image.png) Closes #2134 See merge request !1085
\| \| *	Update merge request text to reflect editability of source/target branch	Stan Hu	2015-08-03	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #2134
\| * \|	Link to admin raketask	Sytse Sijbrandij	2015-08-03	1	-0/+1
\| \| \|
* \| \|	Merge branch 'add-user' into 'master'	Job van der Voort	2015-08-04	7	-0/+29
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added new doc about adding users and members Added new doc in workflow about how to add users and members and I also linked it to "permissions". See merge request !1916
\| * \|	typo	karen Carias	2015-08-03	1	-1/+1
\| \| \|
\| * \|	text fixed	karen Carias	2015-08-03	2	-8/+8
\| \| \|
\| * \|	typo	karen Carias	2015-07-30	2	-9/+9
\| \| \|
\| * \|	added new doc about adding users and members	karen Carias	2015-07-30	7	-0/+29
\| \| \|
* \| \|	Merge branch 'add-license'	Dmitriy Zaporozhets	2015-08-03	5	-8/+69
\|\ \ \
\| * \ \	Merge branch 'master' into add-licenseadd-license	Douwe Maan	2015-07-31	16	-337/+468
\| \|\ \ \
\| * \| \| \|	Fix method name.	Douwe Maan	2015-07-30	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Show buttons to add license, changelog and contribution guide if they're ↵	Douwe Maan	2015-07-30	4	-7/+68
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	missing.
* \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-08-03	3	-46/+3
\|\ \ \ \ \
\| * \ \ \ \	Merge branch 'redis-store' into 'master'	Kamil Trzciński	2015-08-03	3	-46/+3
\| \|\ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump redis-store to 1.1.6 and remove redis-store-fix-expiry According to this https://github.com/redis-store/redis-store/compare/v1.1.4...v1.1.6 and my manual tests the monkey patch for redis-store is no longer required /cc @jacobvosmaer @rspeicher See merge request !1081
\| \| * \| \| \|	Bump redis-store to 1.1.6 and remove redid-store-fix-expiryredis-store	Kamil Trzcinski	2015-07-31	3	-46/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-08-03	48	-406/+1069
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Stan Hu	2015-08-02	9	-6/+43
\| \|\ \ \ \ \
\| \| * \ \ \ \	Merge pull request #9520 from gipcompany/annotate-models-update	Stan Hu	2015-08-02	9	-6/+43
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|	Re-annotate models
\| \| \| * \| \| \|	Re-annotate models	Atsushi Ishida	2015-08-03	9	-6/+43
\| \| \|/ / / /
\| * \| \| \| \|	Merge branch 'rs-code-links' into 'master'	Douwe Maan	2015-08-01	2	-1/+5
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make `code` elements in links display as such When a link consisted only of an inline code block -- ```[`like this`](https://google.com/)``` -- it was hard to tell that it was even a link. Before: > ![Screen_Shot_2015-07-31_at_5.45.06_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/eda0a0630024d461c8de151d06e9f4db/Screen_Shot_2015-07-31_at_5.45.06_PM.png) After: > ![Screen_Shot_2015-07-31_at_5.43.15_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9542c49cfb4d43c015d464ef0ba0440f/Screen_Shot_2015-07-31_at_5.43.15_PM.png) See merge request !1082
\| \| * \| \| \| \|	Make `code` elements in links display as suchrs-code-links	Robert Speicher	2015-07-31	2	-1/+5
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also adds some minor padding to inline `code` elements.
\| * \| \| \| \|	Merge branch 'api-useremails' into 'master'	Robert Speicher	2015-07-31	5	-6/+425
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add ability to manage user email addresses via the API. Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2181 See merge request !1066
\| \| * \| \| \|	Fix indentation	Douwe Maan	2015-07-31	1	-11/+11
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'master' into api-useremails	Douwe Maan	2015-07-31	26	-362/+512
\| \| \|\ \ \ \ \| \| \| \| \|/ / \| \| \| \|/\| \|
\| \| * \| \| \|	Fix docs	Douwe Maan	2015-07-30	2	-7/+7
\| \| \| \| \| \|
\| \| * \| \| \|	Add ability to manage user email addresses via the API.	Douwe Maan	2015-07-29	5	-0/+419
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'mention-name-in-flash-msg' into 'master'	Douwe Maan	2015-07-31	3	-7/+8
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mention group and project names in flash messages upon create, update and delete. Mention group and project names in flash messages upon create, update and delete. I also changed some wording inconsistency. Before ![project_created](https://gitlab.com/axil/gitlab-ce/uploads/b91b92e46b08d6c566acee8d88fccff1/project_created.png) After ![project_created_after](https://gitlab.com/axil/gitlab-ce/uploads/56db5125f2769386c43cf9e2f175a54d/project_created_after.png) See merge request !1070
\| \| * \| \| \| \|	Raise alert when group is deleted.	Achilleas Pipinellis	2015-07-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change was made to match the project deletion.
\| \| * \| \| \| \|	Mention group and project name in flash messages upon create, update and delete.	Achilleas Pipinellis	2015-07-30	3	-7/+8
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'admin-group-member' into 'master'	Douwe Maan	2015-07-31	6	-20/+33
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add specific ability for managing group members To be used for https://dev.gitlab.org/gitlab/gitlab-ee/issues/290 (Internal issue) See merge request !1059
\| \| * \| \| \| \| \|	Use before_actions	Douwe Maan	2015-07-31	2	-4/+7
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Restore Leave button on dashboard groups pageadmin-group-member	Douwe Maan	2015-07-29	1	-4/+3
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Show Leave button when you're the last owner, so that the error explains the ↵	Douwe Maan	2015-07-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	reason
\| \| * \| \| \| \| \|	Disable adding members from admin area when appropriate	Douwe Maan	2015-07-28	1	-16/+18
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add specific ability for managing group members	Douwe Maan	2015-07-28	5	-7/+16
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'fix-multiline-comment-highlighting' into 'master'	Douwe Maan	2015-07-31	3	-2/+29
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix multi-line syntax highlighting ### What does this MR do? This MR fixes multi-line syntax highlighting in the code views. HTML span elements only apply to a single line, and in the case of multi-line comments, the highlighting was dropped as a result. Ensure that each line has the proper styling to fix this. ### Why was this MR needed? The current styling was broken for a while. ### Screenshots Before: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/bbcb61760ab04a010aabc40942a2c0ba/image.png) After: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/48f61c91b6fdd9c99cd7f3d214853141/image.png) ### What are the relevant issue numbers? Closes #1577 Closes #1495 See merge request !1079
\| \| * \| \| \| \| \|	Fix multi-line syntax highlighting	Stan Hu	2015-07-30	3	-2/+29
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	HTML span elements only apply to a single line, and in the case of multi-line comments, the highlighting was dropped as a result. Ensure that each line has the proper styling to fix this. Closes #1577
\| * \| \| \| \| \|	Merge branch 'rs-mr-1050-followup' into 'master'	Robert Speicher	2015-07-31	3	-3/+28
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add spec to RelativeLinkFilter for Unicode filenames Adds specs for changes added in !1050 See merge request !1078
\| \| * \| \| \| \| \|	Fix CHANGELOG entryrs-mr-1050-followup	Robert Speicher	2015-07-30	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add spec to RelativeLinkFilter for Unicode filenames	Robert Speicher	2015-07-30	2	-2/+27
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'rs-markdown-feature-pipelines' into 'master'	Robert Speicher	2015-07-31	4	-314/+388
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prepare Markdown feature spec for testing multiple pipelines This MR lays the groundwork for including or excluding certain HTML::Pipeline filters depending on what we're parsing. For example, excluding reference filters in the Issues and Merge Requests titles. See merge request !1053
\| \| * \| \| \| \| \| \|	Fix setup/teardown for Markdown feature specrs-markdown-feature-pipelines	Robert Speicher	2015-07-29	2	-24/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prior, CI seemed to be freezing after running these specs.
\| \| * \| \| \| \| \| \|	Update Markdown feature to allow for multiple pipelines	Robert Speicher	2015-07-28	2	-163/+209
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Add RelativeLinkFilter section to Markdown fixture	Robert Speicher	2015-07-28	1	-0/+7
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Move MarkdownFeature to its own support file	Robert Speicher	2015-07-28	2	-115/+114
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This file's about to get much bigger and this removes some of the extra noise.
\| \| * \| \| \| \| \| \|	Make links inside ignored elements unique	Robert Speicher	2015-07-28	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is to prevent false matches since the Autolink section uses about.gitlab.com as well.
\| \| * \| \| \| \| \| \|	Break up SanitizationFilter feature specs	Robert Speicher	2015-07-28	1	-16/+37
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Use aggregate_failures where appropriate	Robert Speicher	2015-07-28	1	-34/+53
\| \| \| \| \| \| \| \| \|