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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \|	Add Gitlab::Markdown::TableOfContentsFilter	Robert Speicher	2015-04-30	3	-10/+67
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes header and table of contents processing from Redcarpet renderer.
* \| \| \| \| \| \| \|	Merge branch 'show-invalid-projects-google-code-import' into 'master'	Douwe Maan	2015-04-30	1	-0/+4
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show incompatible projects in Google Code import status Using Google Code import with a JSON file that contained only one Subversion project led to confusion over whether the system was working. Display the list of valid projects if there are any, and show a list of incompatible projects. Provide tips on how to retain issue data after conversion. Closes #1531 ## Screenshots Before: ![Screen_Shot_2015-04-29_at_12.46.41_AM](https://gitlab.com/stanhu/gitlab-ce/uploads/16ea5a99cbace48cd2f2c238b5f73f4e/Screen_Shot_2015-04-29_at_12.46.41_AM.png) After with no projects available (notice the button is hidden): ![Screen_Shot_2015-04-30_at_1.34.38_AM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/43c612cdcbab181713e5764e2f38a04e/Screen_Shot_2015-04-30_at_1.34.38_AM.png) After with 1 valid and 1 incompatible project: ![Screen_Shot_2015-04-30_at_1.37.26_AM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b5bcbd304206a996932e5208ef54a071/Screen_Shot_2015-04-30_at_1.37.26_AM.png) See merge request !586
\| * \| \| \| \| \| \|	Show incompatible projects in Google Code import status	Stan Hu	2015-04-30	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Importing a JSON file with only one Subversion project lead to confusion over whether the system was working. Provide status why these projects could not be imported directly. Closes #1531
* \| \| \| \| \| \| \|	Don't allow a merge request to be merged when its title starts with "WIP".	Douwe Maan	2015-04-30	1	-2/+2
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #8677 from jubianchi/api-500-json	Jeroen van Baarsen	2015-04-28	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Send 500 errors as JSON in the API
\| * \| \| \| \| \| \|	Send 500 errors as JSON in the API	jubianchi	2015-04-27	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Add a rake task to automatically restart foreman when changes occur	jubianchi	2015-04-27	1	-0/+5
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #8754 from jirutka/fix-project_name_regex	Jeroen van Baarsen	2015-04-27	1	-4/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix (project_)name_regex to accept non-ASCII letters and dash
\| * \| \| \| \| \| \|	Fix (project_)name_regex to accept non-ASCII letters and dash	Jakub Jirutka	2015-04-27	1	-4/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Revert "Added X-GitLab-Event header for web hooks"	Valery Sizov	2015-04-27	1	-1/+1
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 548f182814acd0f7a110e6c165c186e345901b00.
* \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-04-27	11	-197/+148
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'fix-gitorious-importer' into 'master'	Dmitriy Zaporozhets	2015-04-27	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Get Gitorious importer to work again. Fixes #1504. See merge request !576
\| \| * \| \| \| \| \| \|	Get Gitorious importer to work again.fix-gitorious-importer	Douwe Maan	2015-04-24	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'rs-minor-styles' into 'master'	Dmitriy Zaporozhets	2015-04-27	1	-14/+25
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor design change grab-bag :tada: I started with one simple change and found a few more, so here they are. ### Simplify icon style selectors All FontAwesome icons have an `fa` class, so just use that. ### Don't override color of code blocks in notes This was a pet peeve of mine. \| Before \| After \| \|:------:\|:-----:\| \| ![Screen_Shot_2015-04-23_at_4.14.23_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c77cb0816bf0f05cb8c4105cdd8b3ec6/Screen_Shot_2015-04-23_at_4.14.23_PM.png) \| ![Screen_Shot_2015-04-23_at_4.15.44_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/463c1d2052e12444563f5e2c102ac51e/Screen_Shot_2015-04-23_at_4.15.44_PM.png) \| ### Items with tooltips don't need a 'data-original-title' attribute This attribute gets added dynamically by Bootstrap's tooltip JS based on the `title` attribute ### Fix Profile > Design live-updating `ui_blue` wasn't added to the list of classes to remove, so if a user changed to that theme, any subsequent changes wouldn't be live-updated. This change refactors Gitlab::Theme a bit to make it harder for this to happen in the future with new themes. ### Remove the `has_bottom_tooltip` class Bootstrap's tooltip JS can read the placement from a `data-placement` attribute. Further, when we supply the `selector` option to `tooltip`, tooltips will be added to any dynamically-added elements matching the selector, without us having to re-call the `tooltip` method. See merge request !569
\| \| * \| \| \| \| \| \| \|	Fix Profile > Design live-updating	Robert Speicher	2015-04-25	1	-14/+25
\| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`ui_blue` wasn't added to the list of classes to remove, so if a user changed to that theme, any subsequent changes wouldn't be live-updated. This change refactors Gitlab::Theme a bit to make it harder for this to happen in the future with new themes.
\| * \| \| \| \| \| \| \|	Convert UserReferenceFilter#link_to_group to use a guard clause	Robert Speicher	2015-04-25	1	-7/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Refactor `UserReferenceFilter#user_link_filter`	Robert Speicher	2015-04-25	1	-35/+43
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix docs for `push_result`	Robert Speicher	2015-04-25	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \|	Fix NotificationService spec	Robert Speicher	2015-04-25	2	-5/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add CommitRange directly to results Hash	Robert Speicher	2015-04-25	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	DRY up ReferenceExtractor	Robert Speicher	2015-04-25	1	-9/+11
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Don't allow nil references to get added to results	Robert Speicher	2015-04-25	1	-0/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update CommitRangeReferenceFilter to use CommitRange class	Robert Speicher	2015-04-25	1	-33/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also matches CommitReferenceFilter's new behavior of always using short SHAs in the link text.
\| * \| \| \| \| \| \| \|	Always use short SHAs as commit reference link text	Robert Speicher	2015-04-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now when a user pastes a full SHA like `d7f61affaf845f44b4cc995e34eb1606c47c8eff`, its link text will only show `d7f61aff` for brevity.
\| * \| \| \| \| \| \| \|	Refactor ReferenceExtractor to use pipeline filters	Robert Speicher	2015-04-25	1	-119/+36
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add results to reference filters	Robert Speicher	2015-04-25	7	-2/+22
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Initialize the references result Hash in ReferenceFilter	Robert Speicher	2015-04-25	1	-0/+16
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #8644 from Bugagazavr/hook-events	Dmitriy Zaporozhets	2015-04-27	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add X-GitLab-Event header for web hooks
\| * \| \| \| \| \| \| \|	Added X-GitLab-Event header for web hooks	bugagazavr	2015-04-25	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #9186 from Senorsen/patch-1	Dmitriy Zaporozhets	2015-04-27	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Fix contributions calendar empty problem under mysql
\| * \| \| \| \| \| \| \|	Fix contributions calendar empty problem under mysql	Zhang Sen	2015-04-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When using MySQL as database backend in GitLab, ``date`` in ``date(created_at), count(id) as total_amount`` won't return the ``date`` column (should be ``date(created_at)``), as a result, there's no contribution in the user profile page. Adding an ``as date`` can solve this problem.
* \| \| \| \| \| \| \| \|	fix redis 3.0.0	tonic	2015-04-25	1	-1/+2
\| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Revert "Rename namespace_regex to namespace_path_regex."	Douwe Maan	2015-04-24	4	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit c0116926c743818b2593474946abb40b56d8fefa.
* \| \| \| \| \| \| \|	Rename namespace_regex to namespace_path_regex.	Douwe Maan	2015-04-24	4	-7/+7
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Revert "Revert disallowing usernames to end in period."	Douwe Maan	2015-04-24	1	-2/+2
\| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit c75c6b840ba9ed82bb01eca52e968c2b0ec985e6.
* \| \| \| \| \| \|	Fix errors.	Douwe Maan	2015-04-24	1	-1/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	No longer needed to pass project argument to commit methods.	Douwe Maan	2015-04-24	2	-3/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Use project.commit convenience method.	Douwe Maan	2015-04-24	7	-10/+10
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Let commit model know about its project.	Douwe Maan	2015-04-24	1	-2/+2
\|/ / / / / /
* \| \| \| \| \|	Provide autoload paths for filters to prevent circular dependency	Robert Speicher	2015-04-23	2	-4/+15
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'issue-body-code-mentions' into 'master'	Dmitriy Zaporozhets	2015-04-23	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug causing at-username inside code blocks to sometimes be picked up as a user mention. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2254. See merge request !553
\| * \| \| \| \| \|	Fix bug causing `@whatever` inside code blocks to sometimes be picked up as ↵issue-body-code-mentions	Douwe Maan	2015-04-21	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	a user mention.
* \| \| \| \| \| \|	Use `search_text_nodes` helper in our custom filtersrs-search_text_nodes	Robert Speicher	2015-04-22	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #1477
* \| \| \| \| \| \|	Update Gitlab::Markdown to use the :new: EmojiFilter :sparkles:	Robert Speicher	2015-04-21	1	-12/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes emoji-centric tests from GFM specs :boom:
* \| \| \| \| \| \|	Add Gitlab::Markdown::EmojiFilter	Robert Speicher	2015-04-21	1	-0/+79
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'rs-reference-filters' into 'master'	Dmitriy Zaporozhets	2015-04-21	12	-285/+874
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Convert GFM reference handling to html-pipeline filters - `Gitlab::Markdown` is now much cleaner - Better separation of concerns - Cleaner, less brittle, more maintainable specs for each reference type. - Label references actually work! See merge request !1753
\| * \| \| \| \| \| \|	Tweak single-word label regex to fix pending spec.	Douwe Maan	2015-04-20	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	project_from_ref returns nil when reference doesn't exist.	Douwe Maan	2015-04-20	1	-9/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	project_from_ref returns nil when reference can't be accessed	Robert Speicher	2015-04-20	6	-9/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prior it would return the project from the current context, which wasn't the intended behavior.
\| * \| \| \| \| \| \|	Better commit lookup for CommitRangeReferenceFilter	Robert Speicher	2015-04-20	1	-3/+15
\| \| \| \| \| \| \| \|