Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-08-17Merge branch 'master' into remove-satellitesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-14Update Flowdock integration to support new Flowdock APIBoyan Tabakov
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-13Merge branch 'improve-hipchat-service-test' into 'master'Dmitriy Zaporozhets
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: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/10f82eb02db138f9680e69cdb3d3ed82/image.png) Issue gitlab-com/support-forum#213 See merge request !1144
2015-08-12Provide more feedback what went wrong if HipChat service failed testStan Hu
Issue gitlab-com/support-forum#213
2015-08-12Add merged label on branches pageFlorent (HP)
2015-08-11Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets
This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
2015-08-11Revert "Merge branch 'refactor-can-be-merge' into 'master'"Dmitriy Zaporozhets
This reverts commit 459e6d346768d9d8fceaee00bf0870b8e7c4ed9a, reversing changes made to 804168e1def1204af712febb229f41a3865f085f. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets
This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-07Add `Group#add_*` convenience methodsRobert Speicher
Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.
2015-08-06Merge branch 'report-spam'Dmitriy Zaporozhets
2015-08-06Allow users to send abuse reportsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-06Merge branch 'remove-email-from-published-keys' into 'master'Douwe Maan
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-05Merge branch 'drop-satellites'Dmitriy Zaporozhets
2015-08-05Merge branch 'revert_touch' into 'master' Sytse Sijbrandij
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
2015-08-05Revert "Update noteable after a new note is added"Valery Sizov
This reverts commit fbdaf0e2a517660c0e4e3960f20b2d3568c33e78.
2015-08-05Add "Confirm user" button in user admin pageStan Hu
Closes #2116 Closes https://github.com/gitlabhq/gitlabhq/issues/9502
2015-08-04Improve tests to use real branches in merge requestsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-04Merge branch 'master' into drop-satellitesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-04Only publish ssh key-type and keyZeger-Jan van de Weg
2015-08-02Re-annotate modelsAtsushi Ishida
2015-07-29Fix specsDouwe Maan
2015-07-24Add User.find_by_username!Robert Speicher
2015-07-17Do not disappoint rubocop.Marin Jankovski
2015-07-17Add specs for gitlab ci service validity.Marin Jankovski
2015-07-16Fix some of testsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-15Remove satellitesDmitriy Zaporozhets
2015-07-14Rename `notice_added_references` to `create_new_cross_references!`Robert Speicher
2015-07-14Refactor Mentionable#notice_added_referencesRobert Speicher
It now accounts for models that have changed but have already been persisted, such as when called from an UpdateService. Closes #1773
2015-07-13Merge branch 'ssh-key-linebreaks' into 'master'Dmitriy Zaporozhets
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-13Merge branch 'rs-disable-2fa' into 'master'Dmitriy Zaporozhets
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-12Add tests for repository search filesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-11Add error message for SSH key linebreaksNikita Verkhovin
2015-07-10Add User#disable_two_factor!Robert Speicher
This method encapsulates all the logic for disabling 2FA on a specific User model.
2015-07-05Add Irker service configuration optionsStan Hu
Closes #1713 Closes #1714 Closes gitlab-com/support-forum#139
2015-07-01Refactor can_be_merged logic for merge requestDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-01Repository#blob_at should return nil for 00000000... shaDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-26Rename abilities to correspond contoller/model action namesDmitriy Zaporozhets
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-24Only look up Commit authors/committers by emailRobert Speicher
- Removes looking up authors/committers by name - Renames `User.find_for_commit` to `User.find_by_any_email`
2015-06-23Merge branch 'rubocop-for-tests' into 'master'Dmitriy Zaporozhets
Enable rubocop for tests too cc @DouweM @rspeicher Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !862
2015-06-23Merge branch 'rs-dev-issue-2414' into 'master'Dmitriy Zaporozhets
Allow Admin to filter users by 2FA status > ![Screen_Shot_2015-06-19_at_4.38.12_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/deba7f2a6b8d1548c1d1ac401e0e35a1/Screen_Shot_2015-06-19_at_4.38.12_PM.png) Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2414 See merge request !852
2015-06-23Merge branch 'master' into rubocop-for-testsDmitriy Zaporozhets
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-23Use alias_attribute to define User#two_factor_enabledRobert Speicher
2015-06-22Fix Style/Blocks cop violationsRobert Speicher
2015-06-22Fix Style/SpaceInsideHashLiteralBraces cop violationsRobert Speicher
These fixes were performed automatically by Rubocop's `-a` flag.
2015-06-22Fix Style/TrailingBlankLines cop violationsRobert Speicher
2015-06-22Remove unnecessary whitespace between let and (Dmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-22Fix `raise_error` without an argument deprecation warningsRobert Speicher
2015-06-22Replace remaining references to `Note.create_cross_reference_note`Robert Speicher
2015-06-22Use to_reference for issue and merge request mentionable specsRobert Speicher
2015-06-22Update mock and stub syntax for specsRobert Speicher