| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| | |
Only show recent push event if the branch still exists or a recent merge request has not been created
Closes #2277
See merge request !1167
|
| | |
| |
| |
| |
| |
| | |
request has not been created
Closes #2277
|
| |/
|
|
| |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\
| |
| |
| | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | |
| |
| |
| | |
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.
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
| | |
| | |
| | | |
Issue gitlab-com/support-forum#213
|
| | |/ |
|
| |/
|
|
|
| |
This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing
changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
|
| |
|
|
|
|
|
| |
This reverts commit 459e6d346768d9d8fceaee00bf0870b8e7c4ed9a, reversing
changes made to 804168e1def1204af712febb229f41a3865f085f.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |
|
|
|
|
|
| |
This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing
changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |
|
|
| |
Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.
|
| |\ |
|
| | |
| |
| |
| | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| | |
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
|
| | | |
|
| |\ \ |
|
| | | |
| | |
| | |
| | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | |\ \
| | |/
| | |
| | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | | |
| | |
| | |
| | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | | | |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Revert "Update noteable after a new note is added"
This reverts commit fbdaf0e2a517660c0e4e3960f20b2d3568c33e78.
https://gitlab.com/gitlab-org/gitlab-ce/issues/2027
See merge request !1094
|
| | | |/
| |/|
| | |
| | | |
This reverts commit fbdaf0e2a517660c0e4e3960f20b2d3568c33e78.
|
| |/ /
| |
| |
| |
| | |
Closes #2116
Closes https://github.com/gitlabhq/gitlabhq/issues/9502
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| |/ |
|
| | |
|
| |
|
|
|
|
|
| |
It now accounts for models that have changed but have already been
persisted, such as when called from an UpdateService.
Closes #1773
|
| |\
| |
| |
| |
| |
| |
| |
| | |
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
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add User#disable_two_factor!
This method encapsulates all the logic for disabling 2FA on a specific
User model.
See merge request !961
|
| | |/
| |
| |
| |
| | |
This method encapsulates all the logic for disabling 2FA on a specific
User model.
|
| |/
|
|
| |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |
|
|
|
|
| |
Closes #1713
Closes #1714
Closes gitlab-com/support-forum#139
|
| |
|
|
| |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |
|
|
| |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
| |
|
|
|
| |
- Removes looking up authors/committers by name
- Renames `User.find_for_commit` to `User.find_by_any_email`
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Enable rubocop for tests too
cc @DouweM @rspeicher
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !862
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | | |
|
| | | |
| | |
| | |
| | | |
These fixes were performed automatically by Rubocop's `-a` flag.
|
| | | | |
|
| | | |
| | |
| | |
| | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Allow Admin to filter users by 2FA status
> 
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2414
See merge request !852
|
| | | | |
|
| | | | |
|
