370 Commits

Include renames

Author	SHA1	Message	Date
Dmitriy Zaporozhets	1af8b1e4f8	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ... Conflicts: app/views/help/index.html.haml lib/gitlab/git_access.rb public/500.html public/502.html	2015-05-15 13:29:58 +03:00
Dmitriy Zaporozhets	f32a045ef4	Merge branch 'version-check' into 'master' ... Version check See merge request !1509	2015-05-13 11:17:16 +00:00
Dmitriy Zaporozhets	b2d45bb544	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ... Conflicts: app/controllers/uploads_controller.rb app/helpers/application_helper.rb app/models/note.rb app/services/test_hook_service.rb db/schema.rb spec/models/note_spec.rb	2015-05-13 14:10:14 +03:00
Dmitriy Zaporozhets	474023b71a	Fix Gemfile.lock	2015-05-12 14:26:46 +03:00
Dmitriy Zaporozhets	1a1e42ad31	Merge branch 'rs-system-note' into 'master' ... Add SystemNoteService class The Note model was basically two models crammed together - one handling user-created notes (i.e., comments on things) and one handling system-created notes (i.e., references). This splits out the system-specific stuff to a new SystemNoteService class. See merge request !595	2015-05-12 10:45:42 +00:00
Robert Speicher	cdb69d728c	Add migration to convert legacy system notes	2015-05-11 00:01:15 -04:00
Robert Speicher	0c113c8dcb	Make otp_backup_codes a text field	2015-05-09 17:32:46 -04:00
Dmitriy Zaporozhets	c3cf32e863	Merge branch 'version-check' into gl-version-check ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/admin/application_settings_controller.rb app/views/admin/application_settings/_form.html.haml db/schema.rb	2015-05-08 16:05:00 +03:00
Douwe Maan	85c04a8aa6	Track historical active user count.	2015-05-07 22:38:17 +02:00
Douwe Maan	fbb011be38	Merge branch 'license' into 'master' ... Allow license to be uploaded and enforce its validity. Addresses #274. Still a work in progress, there are no tests yet, some things need extra validation or prettier error messages, and we're not doing anything to enforce active user count yet. Still, the flow stands! Let me know what you think :) - [x] Check active user count at moment of upload - [x] Prettier validation / error message when license is invalid - [x] Prettier error when public key is invalid - [x] Tests - [x] Work on copy These will go into separate MRs as they require more discussion: - Check historic active user count over past year - Add application setting to disallow creating/activating new user when limit is reached ----- No license:  Also shown when pushing code:  The "Upload a new license in the admin area" part is only for admins, regular users will see "Ask an admin to upload a new license". Upload page in admin area:  License details in admin area:  Notice of a license that will expire: Also notice the license history at the bottom.  Notice of an expired license:  cc @dzaporozhets @sytse See merge request !383	2015-05-07 18:54:47 +00:00
Dmitriy Zaporozhets	548b41bf6d	Fix db schema ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-05-06 14:26:46 +03:00
Dmitriy Zaporozhets	ebcc810b9d	Remove project dropdown and fix db sche,a ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-05-05 18:29:23 +03:00
Douwe Maan	2bb2ade50d	Merge branch 'master' into license ... # Conflicts: # db/schema.rb	2015-05-05 13:03:33 +02:00
Douwe Maan	68ac20604b	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee ... # Conflicts: # app/controllers/groups/application_controller.rb # app/services/test_hook_service.rb # app/views/admin/groups/show.html.haml # app/views/groups/_settings_nav.html.haml # app/views/groups/show.html.haml # app/views/layouts/_head.html.haml # app/views/projects/_settings_nav.html.haml # db/schema.rb # features/project/project.feature # features/steps/project/project.rb	2015-05-05 10:18:27 +02:00
Stan Hu	eb4f1eb5f5	Add application setting to restrict user signups to e-mail domains ... This feature was requested long ago: http://feedback.gitlab.com/forums/176466-general/suggestions/4118466-ability-to-register-only-from-ceratain-domains This MR is based off !253 but changed to use application settings and use wildcard strings to give more flexibility in pattern matching. Regexps seemed overkill and easy to get wrong. Only restrict e-mail addresses upon creation	2015-05-02 09:36:52 -07:00
Douwe Maan	d1f2b09fad	Allow license to be uploaded and enforce its validity.	2015-05-01 14:52:30 +02:00
Douwe Maan	2f4426b7e4	Merge branch 'fix-project-tags' into 'master' ... Fix DB error when trying to tag a repository Steps to reproduce: Go to a project settings, add tags, click on save changes Observed behavior: Error 500 ``` PG::Error: ERROR: column "taggings_count" does not exist LINE 1: UPDATE "tags" SET "taggings_count" = COALESCE("taggings_coun... ``` Ran `rake acts_as_taggable_on_engine:install:migrations`, removed the first migration that created the `tags` and `taggings` table, and added the rest. * Closes #1512 * Closes #1550 * Closes https://github.com/gitlabhq/gitlabhq/issues/6867 * Closes https://github.com/gitlabhq/gitlabhq/issues/9194 See merge request !577	2015-04-30 17:20:36 +00:00
Dmitriy Zaporozhets	39a55bdf1a	Merge branch 'search-layout' into 'master' ... Improvements to search layout Improve search layout to match new UI style and make it more mobile-firendly See merge request !585	2015-04-29 18:40:16 +00:00
Valery Sizov	4d3a93af2d	Remove abandoned GroupMembers	2015-04-29 13:46:57 +03:00
Dmitriy Zaporozhets	1ff01d26e1	Continue refactoring and restyle of search layout ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-28 22:04:19 +03:00
Stan Hu	44afcd2019	Fix DB error when trying to tag a repository ... Upon tagging a repository, an error due to a missing migration occurred: ``` PG::Error: ERROR: column "taggings_count" does not exist LINE 1: UPDATE "tags" SET "taggings_count" = COALESCE("taggings_coun... ``` Ran `rake acts_as_taggable_on_engine:install:migrations`, removed the first migration that created the `tags` and `taggings` table, and added the rest. Closes #1512 Closes https://github.com/gitlabhq/gitlabhq/issues/6867 Closes https://github.com/gitlabhq/gitlabhq/issues/9194	2015-04-27 06:09:20 -07:00
Dmitriy Zaporozhets	2e243fc321	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: README.md VERSION app/controllers/projects/services_controller.rb app/controllers/projects/uploads_controller.rb app/services/test_hook_service.rb db/schema.rb features/steps/admin/settings.rb lib/gitlab/reference_extractor.rb spec/models/note_spec.rb	2015-04-27 11:53:31 +03:00
Vinnie Okada	bd557e4b64	Add new admin settings ... Add new global application settings for default project and snippet visibility levels.	2015-04-26 07:48:19 -06:00
Douwe Maan	456e3a7000	Update schema.	2015-04-24 14:49:23 +02:00
Dmitriy Zaporozhets	5b10796235	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/models/project.rb db/schema.rb	2015-04-20 19:19:27 +03:00
Jeroen van Baarsen	5a4ebfb47a	Fixed the Rails/ActionFilter cop ... Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>	2015-04-20 15:39:37 +02:00
Douwe Maan	7d98c8842d	Move import data out of project so it doesn't take ages to load.	2015-04-17 14:49:00 +02:00
Dmitriy Zaporozhets	d01d0c02b7	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/admin/application_settings_controller.rb app/controllers/groups/group_members_controller.rb app/controllers/projects/deploy_keys_controller.rb app/controllers/projects/project_members_controller.rb app/models/concerns/mentionable.rb app/models/project.rb app/models/project_team.rb app/models/service.rb app/views/admin/application_settings/_form.html.haml app/views/admin/groups/show.html.haml app/views/groups/group_members/_new_group_member.html.haml config/initializers/1_settings.rb db/schema.rb lib/gitlab/reference_extractor.rb spec/lib/gitlab/reference_extractor_spec.rb	2015-04-15 19:22:57 +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
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
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
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
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
Valery Sizov	ca53814389	git hook refactoring	2015-03-26 13:38:26 +02: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
Douwe Maan	f3650d2e5d	Add migration.	2015-03-24 17:00:56 +01:00
Dmitriy Zaporozhets	a05cc636d7	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq ... Conflicts: app/helpers/oauth_helper.rb db/schema.rb	2015-03-21 20:41:10 -07:00
Dmitriy Zaporozhets	6ef20926ee	Add location to user profile	2015-03-20 16:52:23 -07:00
Dmitriy Zaporozhets	aec8c717a1	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq ... Conflicts: Gemfile VERSION app/models/service.rb	2015-03-18 10:33:31 -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	635f18debd	Merge branch 'ce-to-ee' into 'master' ... CE to EE See merge request !353	2015-03-17 19:10:14 +00:00
Dmitriy Zaporozhets	b35d7e5578	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ... Conflicts: db/schema.rb	2015-03-17 10:19:31 -07:00
Dmitriy Zaporozhets	5059c66045	Merge branch 'share-with-different-group' into 'master' ... Don't allow project to be shared with the group it is already in. Fixes #249. See merge request !352	2015-03-17 17:17:26 +00:00