4a0fa27017
Merge branch 'master' into remove-satellites
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 11:41:53 +02:00
88ab815b38
Update Flowdock integration to support new Flowdock API
...
Requires that users create a Git source in their flows and update the configured token to the Git source token. The old flow tokens can't be used.
2015-08-14 16:45:23 +02:00
00a33d67aa
Merge branch 'improve-hipchat-service-test' into 'master'
...
Provide more feedback what went wrong if HipChat service failed test
This MR adds support for displaying the error message during HipChat service test. Before an Error 500 would be displayed with no helpful remarks.
Screenshot:
Issue gitlab-com/support-forum#213
See merge request !1144
2015-08-13 11:43:44 +00:00
2379057002
Provide more feedback what went wrong if HipChat service failed test
...
Issue gitlab-com/support-forum#213
2015-08-12 07:31:25 -07:00
8adf6ba8f5
Add merged label on branches page
2015-08-11 23:00:46 +02:00
3e259ea8bc
Revert "Merge branch 'revert-satellites' into 'master'
"
...
This reverts commit 5daf44b7c82f706fbd23
2015-08-11 14:33:31 +02:00
32046983ad
Revert "Merge branch 'refactor-can-be-merge' into 'master'"
...
This reverts commit 459e6d3467804168e1de
2015-08-11 10:48:02 +02:00
9f10943c1a
Revert "Merge branch 'drop-satellites'"
...
This reverts commit 957e849f416b9dbe9f5a
2015-08-11 10:28:42 +02:00
fb6dc1f07d
Add `Group#add_*` convenience methods
...
Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.
2015-08-07 00:20:02 -04:00
dcb0bf0df5
Merge branch 'report-spam'
2015-08-06 18:07:36 +02:00
cba7f20dc8
Allow users to send abuse reports
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-06 14:03:27 +02:00
c6cbee846c
Merge branch 'remove-email-from-published-keys' into 'master'
...
Only publish ssh key-type and key
Now when requesting my keys; my emailadres is exposed. [My keys](https://gitlab.com/zj.keys )
To prevent harvesting only key-type and the key itself are displayed instead of all data supplied when uploaded.
See merge request !850
2015-08-06 09:05:15 +00:00
957e849f41
Merge branch 'drop-satellites'
2015-08-05 15:40:14 +02:00
764124c380
Merge branch 'revert_touch' into 'master'
...
Revert "Update noteable after a new note is added"
This reverts commit fbdaf0e2a5https://gitlab.com/gitlab-org/gitlab-ce/issues/2027
See merge request !1094
2015-08-05 09:57:27 +00:00
6353ca9ae8
Revert "Update noteable after a new note is added"
...
This reverts commit fbdaf0e2a5
2015-08-05 12:00:12 +03:00
0c1ccda43f
Add "Confirm user" button in user admin page
...
Closes #2116
Closes https://github.com/gitlabhq/gitlabhq/issues/9502
2015-08-05 00:35:53 -07:00
44ac823e59
Improve tests to use real branches in merge requests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-04 17:20:26 +02:00
b48b07044b
Merge branch 'master' into drop-satellites
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-04 16:42:36 +02:00
4ccd767abf
Only publish ssh key-type and key
2015-08-04 14:33:18 +02:00
f33898ecfb
Re-annotate models
2015-08-03 01:52:54 +09:00
72c552c2d4
Fix specs
2015-07-29 13:23:28 +02:00
5ce6d18681
Add User.find_by_username!
2015-07-23 17:16:39 -04:00
77f325a49f
Do not disappoint rubocop.
2015-07-17 17:17:33 +02:00
c7daa5f17f
Add specs for gitlab ci service validity.
2015-07-17 17:03:15 +02:00
abd2bc00f9
Fix some of tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-16 17:04:49 +02:00
a87989fb7d
Remove satellites
2015-07-15 15:45:57 +02:00
f3d4767d0c
Rename `notice_added_references` to `create_new_cross_references!`
2015-07-13 21:31:16 -04:00
e4c698fd5c
Refactor Mentionable#notice_added_references
...
It now accounts for models that have changed but have already been
persisted, such as when called from an UpdateService.
Closes #1773
2015-07-13 21:31:00 -04:00
00053c805c
Merge branch 'ssh-key-linebreaks' into 'master'
...
Add error message for SSH key linebreaks
Solves this [request](http://feedback.gitlab.com/forums/176466-general/suggestions/5653544-check-for-linebreaks-in-ssh-key ).
See merge request !672
2015-07-13 09:33:55 +00:00
d93da8bed5
Merge branch 'rs-disable-2fa' into 'master'
...
Add User#disable_two_factor!
This method encapsulates all the logic for disabling 2FA on a specific
User model.
See merge request !961
2015-07-13 08:47:55 +00:00
ec19a960ca
Add tests for repository search files
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-12 14:32:25 +02:00
562d78a65a
Add error message for SSH key linebreaks
2015-07-12 00:18:56 +06:00
22724418d3
Add User#disable_two_factor!
...
This method encapsulates all the logic for disabling 2FA on a specific
User model.
2015-07-10 16:18:30 -04:00
d4be82d1c9
Add Irker service configuration options
...
Closes #1713
Closes #1714
Closes gitlab-com/support-forum#139
2015-07-05 06:40:56 -07:00
2e6bbb12f8
Refactor can_be_merged logic for merge request
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-01 17:24:03 +02:00
baf12f45d8
Repository#blob_at should return nil for 00000000... sha
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-01 11:02:37 +02:00
342d553709
Rename abilities to correspond contoller/model action names
...
write_ was renamed to create_
modify_ was renamed to update_
So now in update action we have next code
def create
can?(current_user, :create_issue, @issue)
end
def update
can?(current_user, :update_issue, @issue)
end
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-26 15:55:56 +02:00
e9b65a3e05
Only look up Commit authors/committers by email
...
- Removes looking up authors/committers by name
- Renames `User.find_for_commit` to `User.find_by_any_email`
2015-06-23 18:07:15 -04:00
883438970d
Merge branch 'rubocop-for-tests' into 'master'
...
Enable rubocop for tests too
cc @DouweM @rspeicher
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !862
2015-06-23 10:36:36 +00:00
f189c36d8d
Merge branch 'rs-dev-issue-2414' into 'master'
...
Allow Admin to filter users by 2FA status
> 
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2414
See merge request !852
2015-06-23 08:48:22 +00:00
f40b99d02e
Merge branch 'master' into rubocop-for-tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
spec/features/issues_spec.rb
spec/models/forked_project_link_spec.rb
spec/models/hooks/service_hook_spec.rb
spec/models/hooks/web_hook_spec.rb
spec/models/project_services/hipchat_service_spec.rb
spec/requests/api/project_members_spec.rb
spec/requests/api/projects_spec.rb
spec/requests/api/system_hooks_spec.rb
spec/services/archive_repository_service_spec.rb
spec/support/matchers.rb
spec/tasks/gitlab/backup_rake_spec.rb
2015-06-23 10:44:03 +02:00
dcfce8b198
Use alias_attribute to define User#two_factor_enabled
2015-06-22 21:14:07 -04:00
15a05be70d
Fix Style/Blocks cop violations
2015-06-22 16:00:54 -04:00
94eff65569
Fix Style/SpaceInsideHashLiteralBraces cop violations
...
These fixes were performed automatically by Rubocop's `-a` flag.
2015-06-22 14:41:00 -04:00
56246b70fb
Fix Style/TrailingBlankLines cop violations
2015-06-22 14:38:33 -04:00
cf259cdb43
Remove unnecessary whitespace between let and (
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-22 14:39:07 +02:00
0f627f1c60
Fix `raise_error` without an argument deprecation warnings
2015-06-22 12:13:47 +02:00
2120e2dd95
Replace remaining references to `Note.create_cross_reference_note`
2015-06-22 12:13:46 +02:00
213d1a4768
Use to_reference for issue and merge request mentionable specs
2015-06-22 12:13:46 +02:00
5a9ede4721
Update mock and stub syntax for specs
2015-06-22 12:13:46 +02:00
Dmitriy Zaporozhets
Boyan Tabakov
Stan Hu
Florent (HP)
Robert Speicher
Douwe Maan
Sytse Sijbrandij
Valery Sizov
Zeger-Jan van de Weg
Atsushi Ishida
Marin Jankovski
Nikita Verkhovin
