1213 Commits

Include renames

Author	SHA1	Message	Date
Douwe Maan	2bb2ade50d	Merge branch 'master' into license ... # Conflicts: # db/schema.rb	2015-05-05 13:03:33 +02:00
Douwe Maan	6d093d84b1	Show prettier error message when license file is invalid.	2015-05-05 11:49:28 +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	dc2b380da6	Fix config template from parse errors	2015-05-03 08:58:52 -07:00
Achilleas Pipinellis	62aa05dd0c	Merge branch 'master' into 'master' ... Update config.yml.example See merge request !597	2015-05-03 12:05:19 +00:00
Dmitriy Zaporozhets	0df317f729	Merge branch 'restrict-signups-to-domains' into 'master' ... 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 prone to mistakes. Also note that validation is ONLY done on creation to prevent breaking existing users who do not have a whitelisted domain. However, this allows a user to sign-up and change his/her email to a non-whitelisted domain. Screenshots:   See merge request !598	2015-05-03 10:02:45 +00: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
win32	fc79f7382c	Update config.yml.example	2015-05-02 11:04:07 +00:00
Stan Hu	4dda17a5bf	Make Reply-To config apply to change e-mail confirmation and other notifications ... sent through Devise Fix test case that was passing due to a broken `around` statement. Closes #1556	2015-05-01 22:57:10 -07:00
Douwe Maan	d1f2b09fad	Allow license to be uploaded and enforce its validity.	2015-05-01 14:52:30 +02:00
Douwe Maan	822ba95f75	Merge branch 'fix-commit-data-url-generation' into 'master' ... Fix bug where commit data would not appear in some subdirectories Fix issue where commit data would not show up in some subdirectories due to escaped slashes. For example: https://gitlab.common-lisp.net/ecl/ecl/tree/develop/src/gc (now patched with fix) The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b76e) caused slashes in a tree to be escaped automatically. Using a wildcard glob in the route prevents this behavior. * Closes #1478, #1459 * Closes https://github.com/gitlabhq/gitlabhq/issues/9037 See merge request !581	2015-04-28 15:46:36 +00:00
Dmitriy Zaporozhets	8140c68289	Merge branch 'rs-issue-2269' into 'master' ... Remove duplicate settings for default_url_options Closes #2269 See merge request !1797	2015-04-28 08:34:34 +00: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
Stan Hu	ef0055b52d	Fix bug where commit data would not appear in some subdirectories ... The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b76e) caused slashes in a tree to be escaped automatically. Using wildcard globs prevents this behavior. Closes #1478, #1459	2015-04-26 23:52:40 -07: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
Robert Speicher	2c90579749	Set default_url_options in test environments too	2015-04-25 19:46:05 -04:00
Dmitriy Zaporozhets	b0ed2ff1a6	Merge branch 'atom-feeds-everywhere' into 'master' ... Add project activity atom feed and show atom feed buttons everywhere where applicable. See merge request !555	2015-04-24 10:15:13 +00:00
Dmitriy Zaporozhets	f502b293e5	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: db/schema.rb spec/helpers/gitlab_markdown_helper_spec.rb	2015-04-24 11:22:54 +03:00
Robert Speicher	b71e5a17e9	Add default_url_options initializer ... Fixes #2266	2015-04-23 12:58:11 -04:00
Douwe Maan	a6dfd065ca	Add atom feed for project activity.	2015-04-23 17:11:39 +02:00
Dmitriy Zaporozhets	f9119150ec	Merge branch 'rs-rails-env-predicates' into 'master' ... Fix two places where we should be using `Rails.env.development?` See merge request !550	2015-04-23 12:37:46 +00:00
Dmitriy Zaporozhets	71f6143552	Merge branch 'master' into new-sidebar ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/snippets_controller.rb	2015-04-23 12:08:03 +03:00
Dmitriy Zaporozhets	a22f3139f3	Merge branch 'rs-reply-hotkey' into 'master' ... "Reply quoting selected text" shortcut/hotkey Adds the <kbd>r</kbd> hotkey for quoting selected text on Issuable forms. This MR also updates the jasmine gem and adds jasmine-rails to let us use the asset pipeline (and Coffeescript) in JS specs. See merge request !1775	2015-04-22 19:57:40 +00:00
Dmitriy Zaporozhets	4a63573b21	Start applying new layout to snippets pages	2015-04-22 18:17:43 +03:00
Robert Speicher	6c3591279f	Fix two places where we should be using Rails.env.development?	2015-04-20 18:28:19 -04: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
Marin Jankovski	225b43de22	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-04-20 09:43:28 +02:00
Robert Speicher	d5c7b62b8e	rails g jasmine_rails:install	2015-04-18 15:17:25 -04:00
Roshan Gautam	984f8077b3	Fix Resource Owner Password Authentication Flow	2015-04-17 11:47:02 -05:00
Robert Speicher	2d4ffce826	Loosen help page parameter constraints for category	2015-04-15 13:15:18 -04:00
Robert Speicher	e24cb79f31	Add constraints to help#show route parameters	2015-04-15 12:25:37 -04:00
Robert Speicher	1e27b68b36	Add Markdown to Mime types	2015-04-15 12:25:24 -04:00
Robert Speicher	ef47ea3d39	Revert "Fix and improve help rendering" ... This reverts commit d365004e68.	2015-04-15 12:24:44 -04: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	4ab22a8c32	Merge branch 'ldap-block_auto_created_users' into 'master' ... Add config var to block auto-created LDAP users. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2110. See merge request !522	2015-04-15 12:36:43 +00: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	55d086ba08	Clarify config var and add to LDAP docs.	2015-04-14 18:17:46 +02:00
Douwe Maan	238e4f0295	Add config var to block auto-created LDAP users.	2015-04-14 17:09:05 +02:00
Dmitriy Zaporozhets	bf7932bd06	Merge branch 'dir-traversal' into 'master' ... Fix directory traversal vulnerabilities Fixes gitlab/gitlab-ee#272. As @joern mentions: > This is not exploitable via the front-end nginx. But nevertheless this issue should be addressed. See merge request !1760	2015-04-14 13:07:27 +00:00
Douwe Maan	dba63d667d	Allow user map to be specified.	2015-04-14 14:50:56 +02:00
Dmitriy Zaporozhets	ef8d96e5de	Merge branch 'ce-to-ee-2' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: LICENSE app/assets/javascripts/dispatcher.js.coffee app/controllers/help_controller.rb app/models/user.rb app/views/groups/group_members/_new_group_member.html.haml config/gitlab.yml.example config/routes.rb features/groups.feature features/steps/dashboard/help.rb	2015-04-14 15:08:19 +03:00
Douwe Maan	e50556fcc8	Let invites be declined.	2015-04-14 12:08:11 +02:00
Douwe Maan	453340d449	Let membership invitations be resent.	2015-04-14 12:08:10 +02:00
Douwe Maan	39f389ae0f	Add invites controller.	2015-04-14 12:07:33 +02:00
Dmitriy Zaporozhets	9311f86291	Merge branch 'temp-ce-ee' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/assets/javascripts/api.js.coffee app/assets/javascripts/users_select.js.coffee	2015-04-14 13:05:39 +03: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	f39b150a02	Call your existing LDAP server 'main' ... By imposing this rule we avoid having to demand that 'ldapmain' exists in the settings initializer.	2015-04-13 15:45:19 +02:00
Dmitriy Zaporozhets	7f04a4174e	Merge branch 'shell-version-warning' into 'master' ... Warn when gitlab-shell version doesn't match requirement. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1791. See merge request !495	2015-04-13 13:05:47 +00:00
Jacob Vosmaer	ec7a68a1a5	Simplify legacy LDAP config interpretation	2015-04-13 11:50:44 +02:00