19272 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Valery Sizov	4299bc68fa	Merge branch 'mr-app-doc' into 'master' ... new documentation on merge request approvals See merge request !448	2015-07-19 09:38:00 +00:00
Valery Sizov	2ae6908103	Merge branch 'merge_request_approvals' into 'master' ... Ability to set certain approvers for MRs https://dev.gitlab.org/gitlab/gitlabhq/issues/2258 See merge request !447	2015-07-19 09:28:29 +00:00
Valery Sizov	1fc88b58c7	annotate approver and approval models	2015-07-19 11:57:21 +03:00
Job van der Voort	17207b98be	fix typo	2015-07-17 15:50:21 +00:00
Valery Sizov	3cc78d8998	Approvers: UI for project settings	2015-07-17 17:58:33 +03:00
Job van der Voort	114465c3b2	new documentation on merge request approvals	2015-07-17 16:47:54 +02:00
Valery Sizov	76c57aa536	Merge branch 'add-missing-changelog-item' into 'master' ... Add missing changelog item See merge request !445	2015-07-15 11:48:20 +00:00
Dmitriy Zaporozhets	d93911901b	Add missing changelog item	2015-07-15 11:14:15 +00:00
Dmitriy Zaporozhets	934713b6b0	Merge branch 'ce-to-ee' into 'master' ... CE to EE Fixes gitlab/gitlabhq#2496 cc @valery See merge request !442	2015-07-14 15:17:38 +00:00
Dmitriy Zaporozhets	b80cfd3011	Fix unlogical test ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-07-14 16:52:24 +02:00
Dmitriy Zaporozhets	80a2a9e4be	Fix audit_event_service after CE merge ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-07-14 16:27:13 +02:00
Dmitriy Zaporozhets	c84b14d2a1	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/autocomplete_controller.rb app/controllers/omniauth_callbacks_controller.rb app/controllers/projects/services_controller.rb app/helpers/projects_helper.rb app/services/audit_event_service.rb db/schema.rb doc/api/users.md doc/update/6.x-or-7.x-to-7.13.md features/project/project.feature	2015-07-14 15:40:46 +02:00
Dmitriy Zaporozhets	070d6a2452	Merge branch 'fix-ed' into 'master' ... Fix path to move_drop_indexes.ed Small documentation fix. See merge request !1900	2015-07-14 12:08:26 +00:00
Dmitriy Zaporozhets	67ad6cc7b4	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-07-14 12:56:48 +02:00
Dmitriy Zaporozhets	2280cb23d4	Merge branch 'nice-scroll-sidebar' into 'master' ... Add nice scroll for sidebar Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !978	2015-07-14 10:48:21 +00:00
Dmitriy Zaporozhets	77216386be	Merge branch 'scrollbar-issue' into 'master' ... Hide scrollbar from sidebar when external mouse is connected to OSX See merge request !977	2015-07-14 10:47:29 +00:00
Dmitriy Zaporozhets	98cb6256fa	Add nice scroll for sidebar ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-07-14 12:29:57 +02:00
Valery Sizov	bf3c970be9	Merge branch 'update-guide-713' into 'master' ... create update guides for 7.13 See merge request !1899	2015-07-14 10:12:54 +00:00
Valery Sizov	5c3bdaf1d1	Merge branch 'update-guides-713' into 'master' ... update guides for 712 and 713 See merge request !441	2015-07-14 10:09:55 +00:00
Kamil Trzcinski	2def2cc60a	Hide scrollbar from sidebar when external mouse is connected to OSX	2015-07-14 12:02:42 +02:00
Job van der Voort	f15946dd16	update guides for 712 and 713	2015-07-14 11:58:16 +02:00
Jacob Vosmaer	e26e46db2c	Fix path to move_drop_indexes.ed	2015-07-14 11:50:01 +02:00
Job van der Voort	80afd4c594	create update guides for 7.13	2015-07-14 11:49:53 +02:00
Dmitriy Zaporozhets	c013a9de14	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-07-14 11:07:07 +02:00
Dmitriy Zaporozhets	87e6786aa0	Merge branch 'rs-fix-coverage' into 'master' ... Move coverage-related setup back to spec_helper These tools must be loaded before our regular Rails environment. Partially reverts 57830201a9 See merge request !976	2015-07-14 09:03:03 +00:00
Dmitriy Zaporozhets	6114aedfe5	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-07-14 10:52:46 +02:00
Dmitriy Zaporozhets	ee53ba9f34	Merge branch 'mysql-to-postgres-ed' into 'master' ... Add 'ed' step to mysql-to-postgres procedure This change brings the documentation in this repo up to date with that in https://github.com/gitlabhq/mysql-postgresql-converter . See merge request !1896	2015-07-14 08:52:01 +00:00
Dmitriy Zaporozhets	813c57758c	Merge branch 'reset_approvals_on_push' into 'master' ... Reset approvers on push See merge request !440	2015-07-14 08:46:49 +00:00
Dmitriy Zaporozhets	90e47dd949	Merge branch 'rs-issue-1773' into 'master' ... Fix mentions not being created upon issue/merge request update New cross-references weren't being added when they were made in an issue or merge request update. This happened because the relevant `UpdateService`s were making the `notice_added_references` call after the model had already been updated and saved, so the `changes` attribute was empty and no cross-references were made at all. This fixes the bug and adds a bit of testing and a bit of refactoring. Closes #1773 See merge request !974	2015-07-14 08:40:08 +00:00
Dmitriy Zaporozhets	5c53dc5a1e	Merge branch 'project-default-view' into 'master' ... Allow user to specify content he wants to see on project page Improvement to !938. Since a lot of people complain on fact they don't like to see README. Especially since we already have a switcher for dashboard - it kind of acceptable to select behaviour. User can specify which content he/she wants to see:   cc @JobV @jacobvosmaer @marin @sytses See merge request !970	2015-07-14 08:30:46 +00:00
Robert Speicher	ce02bf9900	Move coverage-related setup back to spec_helper ... These tools must be loaded before our regular Rails environment.	2015-07-13 22:41:47 -04:00
Robert Speicher	f3d4767d0c	Rename notice_added_references to create_new_cross_references!	2015-07-13 21:31:16 -04:00
Robert Speicher	e4c698fd5c	Refactor Mentionable#notice_added_references ... It now accounts for models that have changed but have already been persisted, such as when called from an UpdateService. Closes #1773	2015-07-13 21:31:00 -04:00
Dmitriy Zaporozhets	352362adaf	Merge branch 'project-plus-icon' into 'master' ... Replaced icon for project page dropdown button Improve for !971  See merge request !973	2015-07-13 21:53:37 +00:00
Dmitriy Zaporozhets	fd84567545	Improve project new item dropdown ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-07-13 23:36:21 +02:00
Dmitriy Zaporozhets	59d7f4c97f	Merge branch 'use_password_field_defaults_for_services' into 'master' ... Use password field defaults for services Previously we masked the password field manually. After the refactor that services page received we can use `password_field` default masking. Fixes internal https://dev.gitlab.org/gitlab/gitlab-ee/issues/314 See merge request !969	2015-07-13 18:10:08 +00:00
Dmitriy Zaporozhets	13e987a6de	Merge branch 'project-dropdown' into 'master' ... Add dropdown to quickly create issue or branch from project page because just 'new issue' link is not valid for all users. A lot of people use external issue tracker. So I grouped several links under one button   cc @JobV @marin @jacobvosmaer @sytses See merge request !971	2015-07-13 17:53:27 +00:00
Dmitriy Zaporozhets	4a665e3f5d	Merge branch 'scroll-sidebar' into 'master' ... Scroll sidebar On small screens content of sidebar does not fit. This merge request makes sidebar scrollable which makes it usable for tablets and small laptops. This merge request has no screenshot because it brings no visual change. Its about action. cc @darby @JobV See merge request !972	2015-07-13 17:51:07 +00:00
Dmitriy Zaporozhets	24ecc9049f	Increase padding between menu items a bit ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-07-13 19:24:41 +02:00
Dmitriy Zaporozhets	a839b2afc4	Make sidebar scrollable. It prevents content overflow for small screens ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-07-13 19:23:15 +02:00
Dmitriy Zaporozhets	67c17df221	Better wording for project dropdown ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-07-13 19:04:48 +02:00
Dmitriy Zaporozhets	78a94027ea	Add dropdown to quickly create issue or branch from project page ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-07-13 18:42:07 +02:00
Dmitriy Zaporozhets	5f34759ecb	Allow user to specify content he wants to see on project page ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-07-13 18:24:15 +02:00
Jacob Vosmaer	9ba0079c51	Add 'ed' step to mysql-to-postgres procedure ... Introduced in https://github.com/gitlabhq/mysql-postgresql-converter/commit/b2d1599706f532e1bac836243f25e005c816ef14	2015-07-13 18:14:26 +02:00
Achilleas Pipinellis	4fdb3f69ba	Merge branch 'revert-relative-doc-link' into 'master' ... Revert "use relative link to SSH setup page" This broke on GitLab.com. This reverts commit f876ef6e4d. See merge request !952	2015-07-13 15:28:30 +00:00
Marin Jankovski	057d45fb23	Use password field default password masking.	2015-07-13 13:32:14 +02:00
Sytse Sijbrandij	31565d7890	Revert "added link to issue closing pattern in doc" ... This reverts commit 903daedb5a.	2015-07-13 12:36:53 +02:00
Dmitriy Zaporozhets	4f0455c96b	Merge branch 'no-icon-for-back' into 'master' ... Hide icon for bact-to-location menu in sidebar cc @JobV  See merge request !968	2015-07-13 10:29:20 +00:00
Dmitriy Zaporozhets	62da53af33	Hide icon for bact-to-location menu in sidebar ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-07-13 11:56:08 +02:00
Dmitriy Zaporozhets	00053c805c	Merge branch 'ssh-key-linebreaks' into 'master' ... Add error message for SSH key linebreaks Solves this [request](http://feedback.gitlab.com/forums/176466-general/suggestions/5653544-check-for-linebreaks-in-ssh-key). See merge request !672	2015-07-13 09:33:55 +00:00