22224 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robert Schilling	cabe580395	Merge branch 'update-changelog' into 'master' ... Remove duplicate CHANGELOG items for v7.8.0 [ci skip] See merge request !447	2015-03-24 21:00:46 +00:00
Dmitriy Zaporozhets	b8ad3647ad	Merge branch 'fix-nested-tasks' into 'master' ... Fix nested task lists When nesting task list items, the parent item is wrapped in a `<p>` tag. Update the task list parser to handle these paragraph wrappers. cc @sytse See merge request !413	2015-03-24 20:57:35 +00:00
Aurelio Jargas	7070ccebc7	Remove duplicate CHANGELOG items for v7.8.0 ... [ci skip]	2015-03-24 17:15:15 -03:00
Stephan van Leeuwen	3b3662da0a	Updated api method GET /projects/:id/events to use paginate instead of a self-implementation ... Also updated example request url Added changelog item	2015-03-24 19:11:48 +01:00
Douwe Maan	1651c0bc44	Link note avatar to user.	2015-03-24 18:16:40 +01:00
Andrew Tomaka	83b5a9ae2b	Update help texts and default value setting	2015-03-24 12:27:26 -04:00
Douwe Maan	f3650d2e5d	Add migration.	2015-03-24 17:00:56 +01:00
RICKETTM@uk.ibm.com	fda55f9145	Change ordering so that confirm is removed from attrs before attempting to User.build_user	2015-03-24 15:52:26 +00:00
Douwe Maan	515e9d51df	Make sure issue assignee is properly reset.	2015-03-24 16:52:02 +01:00
Douwe Maan	61e8ca8ce0	Don't leak private group existence by redirecting from namespace controller to group controller.	2015-03-24 15:55:12 +01:00
Douwe Maan	e3fb9b1609	Clean up subscriptions when user is deleted.	2015-03-24 15:44:17 +01:00
Douwe Maan	4745424bd3	Respond with full GitAccess error if user has project read access.	2015-03-24 14:12:03 +01:00
Douwe Maan	4830b2be5e	Refactor GitAccess to use instance variables.	2015-03-24 14:11:48 +01:00
Dan Tudor	862e1e6f17	Unescape branch param to delete ... Branch names that contain `/` return a 405 error when being deleted because the slash is escaped to `%2F` This patch will unescape the param prior to executing the delete action.	2015-03-24 13:04:22 +00:00
Sašo Stanovnik	38384bd952	The new fingerprint format wis incompatible with the previous regex.	2015-03-24 10:55:31 +01:00
Douwe Maan	b45c9115e4	Update rugments to 1.0.0.beta6 to fix C# highlighting.	2015-03-24 10:50:58 +01:00
Stan Hu	56d87db32c	Reduce Rack Attack false positives by clearing out auth failure count upon ... successful Git over HTTP authentication. Add logging when a ban goes into effect for debugging. Issue #1171	2015-03-24 00:36:46 -07:00
Stan Hu	eecd897170	Fix code unfold not working on Compare commits page ... Closes #1274	2015-03-24 00:19:41 -07:00
Vinnie OkadaandVinnie Okada	49c3cc85c4	Remove the email patches link for merge commits ... Rugged's `to_mbox` method doesn't work for merge commits, so don't display the option to download merge commits as email patches.	2015-03-23 22:21:40 -06:00
Dmitriy Zaporozhets	c3c9703437	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-03-23 17:11:58 -07:00
Dmitriy Zaporozhets	88a15b4e78	Merge branch 'merge-status-without-timestamps' into 'master' ... Don't mark merge request as updated when merge status relative to target branch changes. Addresses https://gitlab.com/gitlab-org/gitlab-ce/issues/1254 and private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2165. See merge request !431	2015-03-24 00:11:19 +00:00
Dmitriy Zaporozhets	27809a8059	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-03-23 17:10:56 -07:00
Dmitriy Zaporozhets	2bb4ea8542	Merge branch 'notes-count-without-system' into 'master' ... Don't include system notes in issue/MR comment count. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2163. See merge request !430	2015-03-24 00:10:25 +00:00
Dmitriy Zaporozhets	2cd6cc7fed	Merge branch 'improve-diff-header' into 'master' ... Fix file mode going to next line in diff header See merge request !432	2015-03-24 00:09:40 +00:00
Sašo Stanovnik	05d4658b32	Use 2 spaces for indentation, not 4.	2015-03-24 00:49:30 +01:00
Sašo Stanovnik	455a4fe91a	Fixed generating SSH key fingerprints in OpenSSH 6.8.	2015-03-24 00:11:41 +01:00
Andrew Tomaka	4349e524f4	Update broadcast messages to use color_field	2015-03-23 17:22:50 -04:00
Douwe Maan	17192d1bb3	Merge branch 'keyword-args-2.0' into 'master' ... Don't use required keyword arguments to maintain support for Ruby 2.0. See merge request !433	2015-03-23 20:47:17 +00:00
Douwe Maan	8a7b4eeb0e	Revert "Update gemnasium-gitlab-service gem" ... This reverts commit af522ede14.	2015-03-23 21:21:23 +01:00
Douwe Maan	f039e8e03f	Don't use required keyword arguments to maintain support for Ruby 2.0.	2015-03-23 21:20:48 +01:00
Robert Schilling	c03374919f	Merge pull request #9006 from hebbet/patch-1 ... Change comment in blue ui to match other scss	2015-03-23 20:38:21 +01:00
hebbet	97dd1046e7	Change comment in blue ui to match other scss ... Change comment in blue ui to match other scss files	2015-03-23 20:07:13 +01:00
Dmitriy Zaporozhets	2953e0d19b	Merge branch 'emailsonpush-create-delete' into 'master' ... Send EmailsOnPush email when branch or tag is created or deleted. Addresses #1951, #1957 and #1925.     See merge request !1709	2015-03-23 16:48:27 +00:00
Dmitriy Zaporozhets	54326f490e	Merge branch 'no-comment-bubble' into 'master' ... Don't show commit comment button when user is not signed in. Address private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2167. See merge request !429	2015-03-23 16:47:16 +00:00
Dmitriy Zaporozhets	c5d65ed62f	Merge branch 'userpage-activity-scroll' ... Conflicts: app/controllers/users_controller.rb	2015-03-23 09:45:40 -07:00
Dmitriy Zaporozhets	81d603e2c1	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-03-23 09:44:28 -07:00
Dmitriy Zaporozhets	78fe7270ab	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-03-23 09:44:20 -07:00
Dmitriy Zaporozhets	e24da35984	Merge branch 'improve-contributions-calendar' into 'master' ... Replace commits calendar with contributions calendar * count opening of issues and merge requests * dont trigger git repository - use events from database * count pushes instead of commits for faster and easier counting * much-much faster since does not affected by repository size See merge request !420	2015-03-23 16:40:55 +00:00
Dmitriy Zaporozhets	61700f619c	Fix file mode going to next line in diff header	2015-03-23 09:38:52 -07:00
Douwe Maan	ceaa2f5c26	Merge pull request #9001 from vichak/master ... Fix #8966 Remove Milestones/Labels from project navbar when Issues disabled	2015-03-23 17:37:17 +01:00
Douwe Maan	70fa9d5629	Don't mark merge request as updated when merge status relative to target branch changes.	2015-03-23 17:30:19 +01:00
Dmitriy Zaporozhets	66e3999287	Merge branch 'your' into 'master' ... Update views to single form of address. Change "my" to "your" Part of user experience. Every software (twitter, facebook etc) talks to you like "change your password" but not "change my password". cc @sytse @job See merge request !1736	2015-03-23 16:12:51 +00:00
vichak	e5b8cf0a8f	Fix #8966 Remove Milestones/Labels from project navbar when Isses disabled	2015-03-23 16:48:50 +01:00
Douwe Maan	6b92236eeb	Don't include system notes in issue/MR comment count.	2015-03-23 16:43:08 +01:00
Douwe Maan	a30645c68f	Don't show commit comment button when user is not signed in.	2015-03-23 16:17:10 +01:00
Douwe Maan	3ca34bb8f0	Merge branch 'fix-admin-service-template-config' into 'master' ... Include missing events and fix save functionality in admin service template settings form ### What does this MR do? This MR includes missing settings left out in the Admin -> Service Templates page and fixes the inability to save certain settings. ### Are there points in the code the reviewer needs to double check? No. ### Why was this MR needed? Because the service template form was broken and untested. ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? #1275 Before:  After:  See merge request !427	2015-03-23 14:58:15 +00:00
Douwe Maan	b13bed62ea	Clean up code by using keyword arguments.	2015-03-23 15:08:19 +01:00
Stan Hu	a3daead1b0	Include missing events and fix save functionality in admin service template settings form ... Closes #1275	2015-03-23 05:51:38 -07:00
Robert Schilling	005f7eb41f	Merge branch 'upgrade-dockerfile-7.9.0' into 'master' ... Bump Docker build to GitLab v7.9.0 See merge request !426	2015-03-23 12:40:25 +00:00
Stan Hu	a2e161cb35	Bump Docker build to GitLab v7.9.0	2015-03-23 12:11:38 +00:00