832 Commits

Include renames

Author	SHA1	Message	Date
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
Dmitriy Zaporozhets	b75866120b	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-04-15 12:56:25 +03:00
Dmitriy Zaporozhets	5d1ab47bd2	Revert help link tests removal ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-15 12:13:49 +03:00
Stan Hu	48efd65ff6	Remove timing dependency on test ... See: http://www.elabs.se/blog/53-why-wait_until-was-removed-from-capybara	2015-04-14 10:34:48 -07:00
Douwe Maan	c1531fe1d8	Add spinach tests around accepting and declining invitations.	2015-04-14 18:04:29 +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	8949af0c9f	Add feature tests for inviting members.	2015-04-14 12:08:11 +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
Hannes Rosenögger	a62dbd11cb	fix failing test	2015-04-13 23:43:11 +02:00
Hannes Rosenögger	a9306613f6	The help link has been removed. The commit removes the test for it.	2015-04-13 22:46:18 +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
Stan Hu	3d2c387840	Move current user to the top of the list in author/assignee filters ... Closes #1321	2015-04-09 01:04:53 -07:00
Stan Hu	3143edfea6	Fix bug where Wiki pages that include a '/' were no longer accessible ... Closes #1363	2015-04-07 09:10:11 -07:00
Douwe Maan	45ca39e81b	Merge remote-tracking branch 'github.com/master'	2015-04-04 14:23:32 +02:00
Douwe Maan	6237cae1f1	Add admin deploy keys tests.	2015-04-03 12:51:01 +02:00
Douwe Maan	9b3624071e	Add project deploy keys tests.	2015-04-03 12:40:14 +02:00
Sullivan SENECHALandSullivan SENECHAL	d365004e68	Fix and improve help rendering	2015-04-03 11:56:50 +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
Dmitriy Zaporozhets	f8f9750323	Merge branch 'username-period' into 'master' ... Don't allow username to end in period. The current behavior doesn't do username referencing and mentioning in sentences like "I discussed with with @douwe." since `douwe.` is matched as a username. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2174. See merge request !438	2015-04-02 20:28:23 +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
Dmitriy Zaporozhets	b7e2be247f	Fix adding new members to group	2015-03-30 14:17:49 -07:00
Dmitriy Zaporozhets	9d6ffcfa5f	Refactor star btn logic for non-logged in user and fix tests	2015-03-29 18:50:45 -07:00
Douwe Maan	1d829ca151	Fix tests.	2015-03-27 11:10:56 +01:00
Dmitriy Zaporozhets	c1c93f4f7a	Fix tests and unassigned filter for issues. Updated CHANGELOG	2015-03-27 00:27:51 -07:00
Valery Sizov	3bf8f097d9	git hook sample: tests	2015-03-26 13:38:26 +02:00
Stan Hu	546dab6da9	Fix broken side-by-side diff view on merge request page ... Closes #1294	2015-03-25 23:39:34 -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
Valery Sizov	f444c9cc6c	deploy key events: tests	2015-03-24 15:58:02 +02:00
Stan Hu	eecd897170	Fix code unfold not working on Compare commits page ... Closes #1274	2015-03-24 00:19:41 -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
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
Dmitriy Zaporozhets	b449bc5b77	Improve user calendar test	2015-03-22 19:47:23 -07:00
Dmitriy Zaporozhets	54aca18cf8	Contribution calendar will use events instead of commits to count contributions	2015-03-22 14:35:27 -07:00
Dmitriy Zaporozhets	43afe46bbd	Refactor contributions events and write tests for calendar	2015-03-22 13:55:00 -07:00
Stan Hu	90cbb73ed6	Fix "Import projects from" button to show the correct instructions ... Closes #1267	2015-03-22 08:47:22 -07: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	31af3f4003	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq ... Conflicts: spec/models/note_spec.rb	2015-03-19 23:21:50 -07:00
Dmitriy Zaporozhets	1cf138170c	Add tooltip for comment toggle in diff. Add changelog item and fix tests	2015-03-18 20:12:19 -07: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	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
Dmitriy Zaporozhets	11c28f33a8	Fix project memeber management	2015-03-17 09:22:41 -07:00
Valery Sizov	22fcb2f418	improve UI	2015-03-17 17:11:57 +02:00
Dmitriy Zaporozhets	79056e8d41	Fix group members test	2015-03-16 23:58:37 -07:00
Dmitriy Zaporozhets	4ca96a5c26	Return membership lock feature for groups	2015-03-16 22:28:57 -07:00
Dmitriy Zaporozhets	d3361e6d1b	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ... Conflicts: Gemfile.lock app/controllers/admin/application_settings_controller.rb app/controllers/groups/application_controller.rb app/controllers/groups/group_members_controller.rb app/controllers/projects/team_members_controller.rb app/helpers/application_settings_helper.rb app/helpers/projects_helper.rb app/helpers/tab_helper.rb app/models/application_setting.rb app/models/user.rb app/views/devise/shared/_signin_box.html.haml app/views/groups/projects.html.haml app/views/profiles/keys/_key.html.haml app/views/projects/team_members/_form.html.haml app/views/projects/team_members/index.html.haml config/routes.rb db/schema.rb spec/lib/gitlab/ldap/access_spec.rb	2015-03-16 21:25:00 -07:00
Valery Sizov	1b437ec349	tests	2015-03-16 21:38:41 +02:00
Douwe Maan	f66b77e631	Fix failing specs.	2015-03-15 13:55:57 +01:00
Douwe Maan	5ad35bbe02	Use same layout and interactivity for project members as group members.	2015-03-15 13:55:57 +01:00