home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
28,963 Commits 48 Branches 340 Tags
f680eca912f854373fc538ae1e9d0dcb60fcd310
Commit Graph
382 Commits
Author SHA1 Message Date
Sean McGivern f680eca912 Don't allow merges with new commits 
Set a `sha` parameter on the MR form. If this doesn't match the HEAD of
the source branch when the form is submitted, show a warning (like with
a merge conflict) and don't merge the branch.
 2016-06-01 20:34:41 +01:00
Douwe Maan 3416bc53fb Merge branch 'rs-remember-me-2fa' into 'master' 
Pass the "Remember me" value to the 2FA token form

Prior, if a user had 2FA enabled and checked the "Remember me" field,
the setting was ignored because the OTP input was on a new form and the
value was never passed.

Closes #18000

See merge request !4369
 2016-06-01 10:57:05 +00:00
Douwe Maan 4a50e1f051 Merge branch 'current-settings-use-request-store-during-request' 2016-06-01 12:55:00 +02:00
Robert Speicher a602df3031 Pass the "Remember me" value to the 2FA token form 
Prior, if a user had 2FA enabled and checked the "Remember me" field,
the setting was ignored because the OTP input was on a new form and the
value was never passed.

Closes #18000
 2016-05-30 22:25:35 -04:00
Grzegorz Bizon c370dce01c Enable Style/RedundantParentheses rubocop cop 
See #17478
 2016-05-30 15:07:18 +02:00
Zeger-Jan van de WegandStan Hu be613de2cf Project#show on projects pending deletion will 404 
fixes #17508
 2016-05-28 03:14:43 -07:00
DJ Mountney 7d57b11093 Update tests for the current_application_settings request store changes 2016-05-27 19:05:52 -07:00
Robert Speicher 75739e54be Enable RSpec/NotToNot cop and auto-correct offenses 
Also removes the note from the development/testing.md guide
 2016-05-24 15:40:29 -04:00
Robert Speicher 3ba72f69af Enable Style/SpaceAroundKeyword cop and fix offenses 2016-05-23 14:16:35 -04:00
Douwe Maan a97cb8f8b8 Merge branch 'issue_9013' into 'master' 
Let users set notification levels in projects which they are not members

Fixes #9013 

See merge request !3986
 2016-05-20 21:04:55 +00:00
Felipe Artur 6fb9bf87c4 Use the right default notification settings for non members 2016-05-19 19:47:07 -04:00
Dmitriy Zaporozhets 253a017b01 Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-18 12:48:23 -05:00
Felipe Artur 07ff874f57 Let users set notification levels in projects which they are not members 2016-05-17 21:53:03 -05:00
Douwe Maan 8b15628dd0 Merge branch 'issue_14684' into 'master' 
Toggle email signup confirmation in admin settings

Implements toggling verification email #14684

See merge request !3862
 2016-05-16 21:05:05 +00:00
Felipe Artur 7bb84e6497 Change landing page when skipping confirmation email and add documentation 2016-05-16 14:56:32 -03:00
Felipe Artur c5526a2d9a Change skip_user_confirmation_email to send_user_confirmation_email 2016-05-16 14:56:32 -03:00
Felipe Artur 71ca2de7aa Toggle email signup confirmation in admin settings 2016-05-16 14:56:32 -03:00
Sean McGivern bec350528c Force password change after admin reset 
When an admin changes a user's password for them, force the user to
reset the password after logging in by expiring the new password
immediately.
 2016-05-16 09:21:24 +01:00
Douwe Maan 7fc51d1908 Merge branch 'health-check-route' 
# Conflicts:
#	db/schema.rb
 2016-05-12 16:39:03 -05:00
DJ Mountney c8f23bd2ed Support token header for health check token, and general cleanup of the health_check feature. 2016-05-11 17:27:08 -07:00
DJ Mountney 0e0caf4d17 Add tests for the health check feature 2016-05-10 16:19:16 -07:00
Long Nguyen 6781c1b4ba Add specs for user routing and update spec for user controller 2016-05-08 22:06:19 +07:00
Robert Speicher c9bc3d20ef Merge remote-tracking branch 'dev/master' into 'master' 2016-05-02 19:58:54 -04:00
Grzegorz Bizon c9577711ce Handle issue move access instead of raising error 
Closes #15533
 2016-04-30 21:28:40 +02:00
Stan Hu eede032345 Backport GitHub Enterprise import support from EE 
These changes were pulled from GitLab EE to support configuring
an alternative API URL than the default https://api.github.com.
In addition, the `verify_ssl` flag allows users to disable SSL cert
checking.

One modification: add a default `args` option if it does not exist
to avoid breaking existing configurations.
 2016-04-26 21:00:55 -07:00
Douwe Maan b992e2520c Fix typo 2016-04-22 21:46:47 +00:00
Douwe Maan d3462e711c Fix issue with impersonation 2016-04-22 23:21:56 +02:00
Rémy Coutable 5a8873f362 Merge branch 'rs-diff_view' into 'master' 
Always read diff_view setting from the cookie

Prior, when the user had their view set to "parallel" and then visited a
merge request's changes tab _without_ passing the `view` parameter via
query string, the view would be parallel but the `Notes` class was
always instantiated with the default value from `diff_view` ("inline"),
resulting in broken markup when the form to add a line note was
dynamically inserted.

The cookie is set whenever the view is changed, so this value should
always be up-to-date.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14557 and https://gitlab.com/gitlab-org/gitlab-ce/issues/15285

See merge request !3732
 2016-04-22 07:49:46 +00:00
Rémy Coutable 338f6f0902 Merge branch 'issue_5838' into 'master' 
Show project members only for members

fixes #5838 

See merge request !3752
 2016-04-21 10:31:20 +00:00
Felipe Artur 9581aba4d4 Add changelog entry and fix convention in a spec 2016-04-20 12:41:35 -03:00
Robert Speicher 8530ce4c6f Clarify that the diff view setting always comes from the cookie 
This invalidates one test, which we've removed.
 2016-04-19 17:47:58 -04:00
Douwe Maan 55380e69fc Merge branch 'pmq20/gitlab-ce-issue_12785' 2016-04-19 18:25:42 +02:00
Grzegorz Bizon f2e3868124 Check permissions when sharing project with group 
Closes #15330
 2016-04-19 12:15:56 +02:00
Felipe Artur 0b91ff287d Projects members tab should follow visibility levels 2016-04-18 17:53:34 -03:00
Felipe Artur 62f6601c59 Show project members only for members 2016-04-18 17:53:34 -03:00
Felipe Artur 09c8cf9de6 Remove group members check 2016-04-18 11:12:28 -03:00
Felipe Artur ce96d482d9 Insert users check into api 2016-04-18 11:12:27 -03:00
Felipe Artur 07b38c3b38 Code fixes 2016-04-18 11:12:27 -03:00
Felipe Artur 147879ae66 Fix specs 2016-04-18 11:12:27 -03:00
Felipe Artur e8a77c0aee Fix code 2016-04-18 11:12:27 -03:00
Felipe Artur 668d6ffa43 Add specs and fix code 2016-04-18 11:12:27 -03:00
P.S.V.R 3d6ba3b107 Add support to cherry-pick any commit 
Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785
Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514
 2016-04-18 15:39:07 +08:00
Jacob Schatz bb59a1f98e Merge branch 'assign-to-issuable-opener' into 'master' 
Issuable can be assigned to author

Closes #9014

The only difference with #9014 is that I thoughed the author should also be
able to assign the issue. If this is unwanted behavior Ill revert it.

/cc @DouweM

See merge request !2765
 2016-04-15 15:43:26 +00:00
Zeger-Jan van de Weg 33f8b06c39 Merge branch 'master' into assign-to-issuable-opener 2016-04-15 14:38:15 +02:00
Rémy Coutable a434ffd3b3 Make /profile/keys/new redirects to /profile/keys for back-compat 
Report: https://github.com/gitlabhq/gitlabhq/issues/10138

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-15 09:45:58 +02:00
Rémy Coutable 8ea6c6d80c Merge branch 'issue_15044' into 'master' 
Allow to close invalid merge request

fixes #15044

See merge request !3664
 2016-04-13 09:10:57 +00:00
Felipe Artur a64f1c7636 Add changelog entry, improve specs and model code 2016-04-12 15:52:03 -03:00
Douglas Barbosa Alexandre 61a62e00e3 Fix specs for Projects::NotificationSettingsController 2016-04-12 12:57:39 -03:00
Douglas Barbosa Alexandre aabb466e5b Improve specs for group/project notification controller 2016-04-12 12:10:59 -03:00
Douglas Barbosa Alexandre bee28e1785 Requires user to be signed in when changing notification settings 2016-04-11 20:50:26 -03:00