15400 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Douwe Maan	5e2f25c32e	Add explanation to HelpController#clean_path_info.	2015-04-14 13:07:15 +02:00
Douwe Maan	988b703548	Fix a whoopsie daisy in the changelog.	2015-04-11 11:40:28 +02:00
Douwe Maan	edd05fc48c	Fix directory traversal vulnerability around help pages.	2015-04-10 18:18:37 +02:00
Douwe Maan	93133f4da9	Fix directory traversal vulnerability around uploads routes.	2015-04-10 18:18:37 +02:00
Dmitriy Zaporozhets	24d139ba97	Merge branch 'rs-revert-preload-lib' into 'master' ... Revert "Preload lib/" This reverts commit 5511a731bc. The original commit added this because it also enabled threadsafety, a change which was itself later reverted in 66d6c80966, but this got left behind. I don't fully understand the reasoning behind it so if I'm wrong, please tell me. My reasoning for reverting it is that it messes with Rails' (and by extension Spring's) class reloading during development. When I was working in `lib/gitlab/markdown` and had to stop and restart the server every time I made a change, I didn't know it at the time, but this was why. That was a huge pain point. If it's needed for production perhaps we could add a `if Rails.env.production?` clause around it so that it doesn't mess with development. See merge request !1758	2015-04-10 14:34:57 +00:00
Dmitriy Zaporozhets	256d2ae700	Merge branch 'rs-issue-2211' into 'master' ... Update redcarpet to 3.2.3 Closes #2211 See merge request !1756	2015-04-10 12:39:11 +00:00
Robert Speicher	5a0ff2f52f	Be more explicit about which "Markdown" ReferenceExtractor includes	2015-04-09 17:28:46 -04:00
Robert Speicher	13313d9e31	Disable RedCarpet's escape_html option ... This option defaults to true in RedCarpet 3.2.0, but we handle sanitization later in the process with html-pipeline. Closes #2211	2015-04-09 17:28:45 -04:00
Robert Speicher	b142d449c6	Update redcarpet to 3.2.3	2015-04-09 17:28:45 -04:00
Robert Speicher	c9a1634f31	Move lib/gitlab/contributors to its correct path	2015-04-09 15:34:55 -04:00
Robert Speicher	abae9b8d63	Add autoloads for lib/gitlab/satellite/files/* ... These files don't match their naming convention, but for organizational purposes it makes sense.	2015-04-09 14:19:25 -04:00
Robert Speicher	91c39fd8c7	Add lib/gitlab.rb to autoload non-conventional paths	2015-04-09 14:19:25 -04:00
Robert Speicher	2cefdbb535	Move lib/gitlab/oauth to lib/gitlab/o_auth ... Lets Rails autoload these files by name	2015-04-09 14:19:24 -04:00
Robert Speicher	a3601d6005	Revert "Preload lib/" ... This reverts commit 5511a731bc.	2015-04-09 12:21:59 -04:00
Patricio Cano	6848312f37	Corrected title of forking workflow on the README link.	2015-04-08 16:31:27 -05:00
Douwe Maan	f3f856029b	Merge branch 'fix-slashes-in-wiki-urls' into 'master' ... Fix bug where Wiki pages that include a '/' were no longer accessible ### What does this MR do? This MR fixes a regression that caused Wiki pages that included a '/' to no longer be accessible. ### Are there points in the code the reviewer needs to double check? Are there cases that `wiki_helper.rb` doesn't handle? ### Why was this MR needed? The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b76e) caused slashes in a model ID to be escaped automatically. We can no longer use the built-in the URL helpers to generate the links for Wiki pages if we want to maintain support for slashes. There is no option to tell the formatter otherwise: http://stackoverflow.com/questions/25031791/rails-4-1-2-to-param-escapes-slashes-and-breaks-app The Rails code in question is here: https://github.com/rails/rails/blob/4-1-stable/actionpack/lib/action_dispatch/journey/visitors.rb#L159 ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? #1363 See merge request !502	2015-04-08 16:30:23 +00:00
Dmitriy Zaporozhets	a381ecbdbc	Merge branch 'project-file-tabs' into 'master' ... Move project file links to tab bar. The sidebar was getting awfully crowded, so I moved the file links to the tab bar alongside Activity and Readme. Unlike Readme, these files are not actually loaded in a tab, but simply link to the relevant blob, because we don't want to unnecessarily load the potentially large changelog or contribution guide on every project page load.  See merge request !497	2015-04-08 13:10:52 +00:00
Dmitriy Zaporozhets	e86e101370	Merge branch 'bump_all_versions' into 'master' ... Corrected steps for creating a patch release Added step to bump all versions (CE, EE, CI) every time there is a patch release and the reasoning behind it See merge request !1754	2015-04-08 11:16:44 +00:00
Dmitriy Zaporozhets	a4ff127728	Merge branch 'rs-application-form-messages' into 'master' ... Make the "New Application" form's error messages visible Prior, if you submit the form without values the error text and the form fields were white-on-white:  After:  See merge request !1752	2015-04-08 11:14:08 +00:00
Dmitriy Zaporozhets	4902dca966	Merge branch 'rs-issue-2152' into 'master' ... Render a 404 when RefsController#logs_tree gets an HTML request Fixes #2152 See merge request !1748	2015-04-08 11:11:38 +00:00
Dmitriy Zaporozhets	584fa0bdca	Merge branch 'rs-signup-box-text' into 'master' ... Improve wording below signup box Before:  After:  See merge request !1755	2015-04-08 11:10:41 +00:00
Dmitriy Zaporozhets	7b00721bb9	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-04-08 14:10:08 +03:00
Dmitriy Zaporozhets	041ce7b303	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-04-08 14:09:58 +03:00
Dmitriy Zaporozhets	49ca05f4de	Merge branch 'rs-shortcuts-typo' into 'master' ... Typo -- findAndollowLink -> findAndFollowLink Pushed here to get working CI. See merge request !1750	2015-04-08 11:08:30 +00:00
Jeroen van Baarsen	4cf25eea3a	Merge pull request #8546 from h0ru5/patch-1 ... add necessary dir for uploads in update to 6.7	2015-04-08 10:07:17 +02:00
Patricio Cano	3769e41ad8	Corrected title of forking workflow	2015-04-07 19:37:56 -05:00
Sytse Sijbrandij	4b2aa9cd20	Merge branch 'forking-doc' into 'master' ... Documentation on how to fork a project Added documentation on how to fork a project. /cc @sabba See merge request !1623	2015-04-08 00:34:32 +00:00
Patricio Cano	a332e7bd02	Implemented changes suggested by Job.	2015-04-07 19:27:04 -05:00
Robert Speicher	8714038410	Improve wording below signup box ... [ci skip]	2015-04-07 17:46:00 -04:00
Patricio Cano	56a19b8043	Added step to bump all versions (CE, EE, CI) every time there is a patch release and the reasoning behind it	2015-04-07 15:24:15 -05:00
Patricio Cano	45c82b3845	Added 7.9.3 to CHANGELOG	2015-04-07 13:18:37 -05:00
Robert Speicher	b9069f31b9	Make the New Application form's error messages visible	2015-04-07 13:01:30 -04:00
Stan Hu	3143edfea6	Fix bug where Wiki pages that include a '/' were no longer accessible ... Closes #1363	2015-04-07 09:10:11 -07:00
Robert Speicher	f7190e428f	Typo -- findAndollowLink -> findAndFollowLink	2015-04-07 11:03:48 -04:00
Dmitriy Zaporozhets	7d57d8b783	Merge branch 'rs-issue-2088' into 'master' ... Lower the pointHitDetectionRadius for commit charts Needed to update the Chart.js dependency as well. Fixes #2088 See merge request !1749	2015-04-07 10:07:52 +00:00
Dmitriy Zaporozhets	7feec5fe05	Merge branch 'add-menu-icons' into 'master' ... Add icons to Add dropdown items. Before:  After:  See merge request !498	2015-04-07 09:55:48 +00:00
Dmitriy Zaporozhets	18dfe0ce76	Merge branch 'emailsonpush-last-line' into 'master' ... Fix final line in EmailsOnPush email diff being rendered as error. Fixes https://github.com/gitlabhq/gitlabhq/issues/8976 and private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2194. Pulls in gitlab_git 7.1.5, which includes https://gitlab.com/gitlab-org/gitlab_git/merge_requests/18. See merge request !480	2015-04-07 09:54:23 +00:00
Dmitriy Zaporozhets	d21d5d2d72	Merge branch 'import-event' into 'master' ... Add event to activity feed for imported projects.  See merge request !496	2015-04-07 09:46:11 +00:00
Robert Speicher	5cc11cfcab	Lower the pointHitDetectionRadius for commit charts ... Fixes #2088	2015-04-07 00:37:05 -04:00
Robert Speicher	26a6cec90b	Update Chart.js	2015-04-07 00:37:05 -04:00
Robert Speicher	167a6b9eef	Render a 404 when RefsController#logs_tree gets an HTML request ... Fixes #2152	2015-04-06 23:08:28 -04:00
Douwe Maan	cf0e84cf04	Add icons to Add dropdown items.	2015-04-06 15:13:50 +02:00
Douwe Maan	ee9e922e96	Move project file links to tab bar.	2015-04-06 15:04:13 +02:00
Douwe Maan	4740242a67	Change text of project creation event for imports.	2015-04-06 14:51:41 +02:00
Douwe Maan	99abbe7dbe	Use Projects::CreateService to create imported projects so hooks are executed.	2015-04-06 14:51:09 +02:00
Douwe Maan	e69e430ce7	Allow projects to be imported into namespaces user is master of.	2015-04-06 14:50:43 +02:00
Dmitriy Zaporozhets	526b28daa3	Merge pull request #9091 from bbodenmiller/patch-1 ... remove extra scrollbar on background jobs tab	2015-04-06 08:47:18 +03:00
Ben Bodenmiller	af4577d779	remove extra scrollbar on background jobs	2015-04-04 05:46:18 -07:00
Douwe Maan	45ca39e81b	Merge remote-tracking branch 'github.com/master'	2015-04-04 14:23:32 +02:00
Douwe Maan	124e7d5efc	Merge branch 'no-limit-fetch' into 'master' ... Remove sidekiq-limit_fetch because it require Redis 2.6. See merge request !491	2015-04-04 12:19:51 +00:00