451 Commits

Include renames

Author	SHA1	Message	Date
Valery SizovandDmitriy Zaporozhets	5dd1deb2b0	Remove abandoned GroupMembers ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: db/schema.rb	2015-04-29 14:30:45 +03:00
Dmitriy Zaporozhets	8e4b8e20ef	Merge branch 'revert-username-period' into 'master' ... Revert disallowing usernames to end in period. cc @JobV @jacobvosmaer See merge request !545	2015-04-20 15:30:54 +03:00
Dmitriy Zaporozhets	8b4b687d44	Merge branch 'google-code-import-performance' into 'master' ... Decrease memory use and increase performance of Google Code importer. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2241. See merge request !536	2015-04-17 17:34:48 +03:00
Douwe MaanandDmitriy Zaporozhets	b6d01abc02	Fix username period migration to preserve uniqueness of names and paths.	2015-04-17 14:33:34 +03:00
Dmitriy Zaporozhets	e3d818a4e8	Merge branch 'invitation' into 'master' ... Allow users to be invited. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2058. The "Add members" panes for both Group Members and Project Members have gained a line of text by the People field.  Entering an email address that is not already a member will give you the option to invite them.  Choosing the option will add them to the People field. This works the right way (TM) in combination with adding existing users as members.  The invited member will be shown in the members list as such. The access level can be changed, and the invite can be revoked by deleting the member.  The invited user will receive an email with an "Accept invitation" link.  If they're not already logged in, clicking this link will redirect them to the sign in/up page with a helpful notice.  Signing in or signing up will redirect them back to the invite detail page, where they can actually accept the invitation, which will update the member record in question to point to the user in question.  Accepting the invitation will redirect them to the group (or project) with an appropriate notice.  As currently, they will also receive this information by email.  At the same time, the person who initially invited the email address is sent a notification as well, so they know of the new member and to tell them what name the user signed up with.  The member row on the Members page will now have been updated with the new user account.  See merge request !500	2015-04-15 10:48:28 +00:00
Douwe Maan	63b21945d2	Merge branch 'google-code-import' into 'master' ... Import projects from Google Code. Resolves #1257. Issue import logic almost entirely taken from https://gitlab.com/o9000/google-code-to-gitlab ( ♥️ @o9000). ### To do - [x] List projects from Google Takeout file - [x] Import Git repository - [x] Import issues - [x] Link to correct attachment URL (https://code.google.com/p/support-tools/issues/detail?id=50) - [x] Handle deleted attachments - [x] Handle blockedOn attribute - [x] Add directions on how to get data from Google Takeout ### Import instructions  ### Imported issue  See merge request !471	2015-04-15 06:53:42 +00:00
Douwe Maan	c1531fe1d8	Add spinach tests around accepting and declining invitations.	2015-04-14 18:04:29 +02:00
Jacob Vosmaer	0b2670f82f	Remove unnecessary semicolons ... I could not help myself	2015-04-14 15:45:15 +02:00
Jacob Vosmaer	41a1cb88f4	Use different queries for MySQL and Postgres ... I could not find a query that worked on both; these two queries look very similar and seem to do the same thing.	2015-04-14 15:44:19 +02:00
Senorsen	7b28218f96	Allow user to choose which email to be public ... This commit allows user to show one of their emails in profile page, or don't show email in this page.	2015-04-14 19:42:48 +08:00
Douwe Maan	1e97864958	Add invite data to member.	2015-04-14 12:06:42 +02:00
Dmitriy Zaporozhets	4ab717ea6a	Merge branch 'ldap_migration' ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: db/schema.rb	2015-04-13 17:18:02 +03:00
Jacob Vosmaer	afa47eddcc	Also ldap_group_links where provider='ldap'	2015-04-13 11:56:35 +02:00
Jacob Vosmaer	8476d171cc	Merge branch 'ldap_migration' of dev.gitlab.org:gitlab/gitlabhq into ldap_migration	2015-04-13 11:52:05 +02:00
Jacob Vosmaer	8b4705fea6	Make migration work if LDAP is disabled	2015-04-13 11:50:00 +02:00
Dmitriy Zaporozhets	04f05ac1fb	Check for table instead of class	2015-04-13 12:26:14 +03:00
Jacob Vosmaer	f64db1fab9	Try to explain what we are doing	2015-04-13 11:22:31 +02:00
Dmitriy Zaporozhets	9c14ed0689	Merge branch 'public-deploy-keys' into 'master' ... Allow admin to create public deploy keys that are accessible to any project. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1774. Project settings:  The "Public deploy keys" section is only shown when there are any. If there are public deploy keys but no project deploy keys, only public deploy keys are shown. If there are no public deploy keys and no project deploy keys, the current "Deploy keys from projects you have access to will be displayed here" placeholder is shown. The list of projects below the public key has been changed to only show projects the user has access to. "Public deploy key" seems to be repeated on the left, but the first is just the title. The label is always visible for public deploy keys. Admin index:  Admin detail page:  Projects using the deploy key are listed on the left and can be disabled easily. See merge request !469	2015-04-13 09:08:13 +00:00
Dmitriy Zaporozhets	896ea2482b	Change migration to SQL ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-13 11:50:21 +03:00
Robert Speicher	1fd03a9b79	Add migration to rename BuildboxService to BuildkiteService	2015-04-11 14:05:23 -04:00
Valery Sizov	8666f497ff	fix ldap identities	2015-04-11 17:56:45 +03:00
Douwe Maan	7b5bc32cad	Allow projects to be imported from Google Code.	2015-04-03 15:29:27 +02:00
Douwe Maan	edc4a56d26	Allow admin to create public deploy keys that are accessible to any project.	2015-04-03 12:23:20 +02:00
Douwe Maan	317206300d	Merge branch 'configurable-attachment-size' into 'master' ... Support configurable attachment size in Application Settings page ### What does this MR do? This MR provides the ability to configure the maximum size of an attachment inside a note. A parameter has been added to the Application Settings page. ### Are there points in the code the reviewer needs to double check? What should be done with the legacy note attachment validation? I added code to make the validation work with the configurable setting. I could see an issue where an admin lowers the limit from 10 megabytes to 5 megabytes, which could cause an existing model to be invalid. ### Why was this MR needed? We often have attachments that exceed 10 MB, and it would be nice to be able to override the defaults. ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? See Issue #1258 ### Screenshots Before:  After:  See merge request !407	2015-04-03 08:47:55 +00:00
Stan Hu	dfd256f29e	Support configurable attachment size via Application Settings ... Fix bug where error messages from Dropzone would not be displayed on the issues page Closes #1258	2015-04-02 00:04:08 -07:00
Douwe Maan	45ee9009f5	Fix migration SQL.	2015-03-31 23:42:49 +02:00
Douwe Maan	175f7f68a6	Move files for moved namespaces.	2015-03-31 09:30:34 +02:00
Douwe Maan	5f93b0e3da	Don't allow username to end in period.	2015-03-27 11:10:56 +01:00
Douwe Maan	f3650d2e5d	Add migration.	2015-03-24 17:00:56 +01:00
Dmitriy Zaporozhets	6ef20926ee	Add location to user profile	2015-03-20 16:52:23 -07:00
Hannes Rosenögger	9e5738b007	Extend the commit calendar to show the actual commits for a date	2015-03-18 08:42:42 +01:00
Dmitriy Zaporozhets	9162e34bb0	Merge branch 'issue_subscription' into 'master' ... Subscription to issue/mr Fixes #1911 and #1909   See merge request !1702	2015-03-17 16:45:04 +00:00
Valery Sizov	1b437ec349	tests	2015-03-16 21:38:41 +02:00
Valery Sizov	f53683e67f	fix specs	2015-03-16 16:51:49 +02:00
Valery Sizov	410d25c8ca	rename table subscribe; make it polymorfic	2015-03-16 15:22:50 +02:00
Valery Sizov	09ef69b7c8	code folding fix	2015-03-16 13:52:55 +02:00
Valery Sizov	9698b36c1c	Subscription	2015-03-15 19:44:59 +02:00
Vinnie Okada	ad0ca0499a	Merge branch 'master' into fix-restricted-visibility ... Conflicts: db/schema.rb	2015-03-14 10:49:11 -06:00
Valery Sizov	02ed61c4db	remove duplication	2015-03-10 20:09:34 +02:00
Valery Sizov	ed4c7190ed	Fix importers with OCC	2015-03-10 12:23:11 +02:00
Dmitriy Zaporozhets	27e3b47b7f	Fix user fixtures for development	2015-03-08 17:35:49 -07:00
Vinnie Okada	cacac147de	Move restricted visibility settings to the UI ... Add checkboxes to the application settings page for restricted visibility levels, and remove those settings from gitlab.yml.	2015-03-07 13:11:08 -07:00
Stan Hu	7e204cf389	Added comment notification events to HipChat and Slack services. ... Supports four different event types all bundled under the "note" event type: - comments on a commit - comments on an issue - comments on a merge request - comments on a code snippet	2015-03-06 06:54:00 -08:00
Stan HuandDouwe Maan	afe5d7d209	Issue #595: Support Slack notifications upon issue and merge request events ... 1) Adds a DB migration for all services to toggle on push, issue, and merge events. 2) Upon an issue or merge request event, fire service hooks. 3) Slack service supports custom messages for each of these events. Other services not supported at the moment. 4) Label merge request hooks with their corresponding actions.	2015-03-03 11:14:31 +01:00
Dmitriy Zaporozhets	a9eba1bde0	No need to block db:rollback for safe migration	2015-02-25 19:51:13 -08:00
Dmitriy Zaporozhets	78391fe5a0	Merge branch 'fix-another-migration' into 'master' ... Prevent another migration from failing due to indirect use of model columns not yet created See https://github.com/gitlabhq/gitlabhq/issues/8817#issuecomment-76007077 cc @marin See merge request !1597	2015-02-26 02:53:37 +00:00
Douwe Maan	4803af45df	Prevent another migration from failing.	2015-02-25 22:55:37 +01:00
Dmitriy Zaporozhets	a52529f9b6	Merge branch 'bitbucket-import' ... Conflicts: app/views/import/gitorious/status.html.haml db/schema.rb	2015-02-25 09:21:45 -08:00
Dmitriy Zaporozhets	2cd2543c44	Merge branch 'mwessel/gitlab-ce-set-last-activity-at' into 'master' ... Give last_activity_at a default value so it will always be set For https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/345 See merge request !1589	2015-02-24 23:15:04 +00:00
Douwe Maan	ad6d623234	Add Bitbucket importer.	2015-02-24 15:07:24 +01:00