7874 Commits

Include renames

Author	SHA1	Message	Date
Dmitriy Zaporozhets	9bbbc7723c	Fix rubocop	2015-03-25 09:55:37 -07:00
Dmitriy Zaporozhets	3840549566	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq ... Conflicts: app/assets/javascripts/dispatcher.js.coffee features/admin/settings.feature features/steps/admin/settings.rb features/steps/user.rb features/user.feature lib/gitlab/git_access.rb	2015-03-25 09:16:09 -07:00
Dmitriy Zaporozhets	f729f60447	Merge branch 'more-rubocop-styles' into 'master' ... More rubocop styles See merge request !449	2015-03-25 15:37:04 +00:00
Dmitriy Zaporozhets	8f3f6e9efb	Merge branch 'api-internal-errors' into 'master' ... Respond with full GitAccess error if user has project read access. Should help with debugging #1236. cc @marin See merge request !437	2015-03-25 04:16:45 +00:00
Dmitriy Zaporozhets	f2ea9d9f3f	Improve sticky headers in diffs ... * disable sticky headers in discussion * enable sticky header on mr page with you click changes tab	2015-03-24 19:00:00 -07:00
Dmitriy Zaporozhets	69454e36f7	Style/RedundantReturn enabled	2015-03-24 18:35:57 -07:00
Dmitriy Zaporozhets	6ec8ff069c	Enable more rubocop style checks	2015-03-24 18:28:10 -07:00
Dmitriy Zaporozhets	b9372c9997	Merge branch 'milestone_and_labels_links' into 'master' ... Milestones and labels can be used even when issues are disabled. When Issues are disabled for a project Milestones and Labels can still be used for Merge Requests. See merge request !1739	2015-03-25 01:02:34 +00:00
Dmitriy Zaporozhets	05fcfe6daf	Merge branch 'mr-button-color' into 'master' ... Change merge request button color based on CI status Green button looks confusing when CI fails Screenshots:   See merge request !448	2015-03-24 23:41:42 +00:00
Dmitriy Zaporozhets	2993e2801a	Merge branch 'note-avatar-link' into 'master' ... Link note avatar to user. See merge request !446	2015-03-24 23:40:19 +00:00
Dmitriy Zaporozhets	69ab616b38	Merge branch 'user-subscriptions-dependent' into 'master' ... Clean up subscriptions when user is deleted. cc @vsizov See merge request !439	2015-03-24 23:35:05 +00:00
Dmitriy Zaporozhets	0d50a65b32	Fix diff header in discussion blocks	2015-03-24 16:27:40 -07:00
Dmitriy Zaporozhets	35ec08a6e2	Change merge request button color based on CI status	2015-03-24 16:13:29 -07:00
Dmitriy Zaporozhets	3a602c8432	Merge pull request #9007 from atomaka/atomaka/feature/broadcast-message-colors ... Complete transition to using color_field for selecting colors	2015-03-24 15:27:58 -07:00
Marin Jankovski	bbf6019dd8	Milestones and labels can be used even when issues are disabled.	2015-03-24 15:18:27 -07:00
Dmitriy Zaporozhets	533b5721c6	Merge branch 'unset-assignee' into 'master' ... Make sure issue assignee is properly reset. Previously, when the assignee was reset via the sidebar or bulk edit, `assignee_id` was set to `-1` rather than `null`, which caused the two issues shown below:  - A "(deleted)" participant - An empty selectbox in the sidebar, instead of "Select assignee" See merge request !443	2015-03-24 21:10:18 +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
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	515e9d51df	Make sure issue assignee is properly reset.	2015-03-24 16:52:02 +01:00
Douwe Maan	e3fb9b1609	Clean up subscriptions when user is deleted.	2015-03-24 15:44:17 +01:00
Douwe Maan	4830b2be5e	Refactor GitAccess to use instance variables.	2015-03-24 14:11:48 +01: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
Andrew Tomaka	4349e524f4	Update broadcast messages to use color_field	2015-03-23 17:22:50 -04: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
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
Valery Sizov	08586a6169	Audit log for deploy keys	2015-03-23 19:11:39 +02: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	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
vichak	a793c06532	Fix #8966 Remove Milestones ans Labels from project navbar when Issues disabled	2015-03-23 10:38:33 +01:00
Dmitriy Zaporozhets	bc4e251898	Make panel heading font bold	2015-03-22 20:16:25 -07:00
Dmitriy Zaporozhets	9e554a5223	Update views to single form of address. Change "my" to "your"	2015-03-22 20:10:12 -07:00
Dmitriy Zaporozhets	fee1f2e0ab	Fix atom feed for user page	2015-03-22 19:41:12 -07:00