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
path: root/spec
AgeCommit message (Collapse)Author
2015-08-26Groundwork for merging CI into CEDouwe Maan
2015-08-24Fix Error 500 in API when accessing a group that has an avatarStan Hu
Closes #2340
2015-08-23Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLabStan Hu
and request them each session. Pass these tokens to the project import data. This prevents the need to encrypt these tokens and clear them in case they expire or get revoked. For example, if you deleted and re-created OAuth2 keys for Bitbucket, you would get an Error 500 with no way to recover: ``` Started GET "/import/bitbucket/status" for x.x.x.x at 2015-08-07 05:24:10 +0000 Processing by Import::BitbucketController#status as HTML Completed 500 Internal Server Error in 607ms (ActiveRecord: 2.3ms) NameError (uninitialized constant Import::BitbucketController::Unauthorized): app/controllers/import/bitbucket_controller.rb:77:in `rescue in go_to_bitbucket_for_permissions' app/controllers/import/bitbucket_controller.rb:74:in `go_to_bitbucket_for_permissions' app/controllers/import/bitbucket_controller.rb:86:in `bitbucket_unauthorized' ``` Closes #1871
2015-08-22Create cross-reference for closing references on commits pushed to ↵Maël Valais
non-default branches. I also revamped the tests on "closing reference commits" (= "Fixes #xxxx" for example). Now, there are two different contexts: - when the commits with "closing reference" are pushed to the default branch, - when the commits with "closing reference" are pushed to a non-default branch. Closes gitlab-org/gitlab-ce#2190.
2015-08-22Merge branch 'reply-by-email' into 'master'Robert Speicher
Reply by email Fixes #1360. It's far from done, but _it works_. See merge request !1173
2015-08-22No HTML-only email pleaseDouwe Maan
2015-08-22Merge branch 'fix-email-autocomplete' into 'master'Douwe Maan
Fix bug preventing invite by e-mail This was broken in 70f5291808 as a result of introducing the ability to filter by current user. Closes #2320 See merge request !1181
2015-08-21Fix bug preventing invite by e-mailStan Hu
This was broken in 70f5291808 as a result of introducing the ability to filter by current user. Closes #2320
2015-08-21Merge branch 'rs-dev-issue-2550' into 'master'Douwe Maan
Remove trailing HTML entities from non-Rinku autolinks as well. Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2550 See merge request !1179
2015-08-21Block blocked users from replying to threads by email.Douwe Maan
2015-08-21Merge branch 'hide-recent-push' into 'master'Dmitriy Zaporozhets
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
2015-08-21Merge branch 'comment-case-insensetive-search' into 'master'Dmitriy Zaporozhets
Case-insensitive search for comments Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1174
2015-08-21Remove trailing HTML entities from non-Rinku autolinks as well.Robert Speicher
2015-08-21Fix markdown specs again. Apparently development and test behave differently.Douwe Maan
2015-08-21Fix markdown specs.Douwe Maan
2015-08-20Add stub_reply_by_email_setting helper.Douwe Maan
2015-08-20Use heredocs.Douwe Maan
2015-08-20Add fixture_file helper.Douwe Maan
2015-08-20Update spec.Douwe Maan
2015-08-20Remove more unused fixtures.Douwe Maan
2015-08-20Removed unused fixtures.Douwe Maan
2015-08-20Merge branch 'master' into reply-by-emailDouwe Maan
2015-08-20Test Gitlab::Email::Receiver.Douwe Maan
2015-08-20Test EmailReceiverWorker.Douwe Maan
2015-08-20Test Email::AttachmentUploader.Douwe Maan
2015-08-20Extract ReplyParser and AttachmentUploader from Receiver.Douwe Maan
2015-08-20Only show recent push event if the branch still exists or a recent merge ↵Stan Hu
request has not been created Closes #2277
2015-08-20Fix blame view line groupingsStan Hu
Closes #2305
2015-08-20Start on tests.Douwe Maan
2015-08-20Test Gitlab::ReplyByEmail.Douwe Maan
2015-08-19Case-insensetive search for commentsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-19Merge branch 'remove-satellites'Dmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-18Merge branch 'fix-authhash-infinite-loop' into 'master'Robert Speicher
Fix infinite loop when SAML was incorrectly configured. See merge request !1170
2015-08-18Merge branch 'mr-source-branch-clear-cache' into 'master'Dmitriy Zaporozhets
Clear cache to prevent listing deleted branches after MR removes source branch Closes #2272 See merge request !1160
2015-08-18Merge branch 'rs-remove-gfm_with_options' into 'master'Douwe Maan
Remove the `gfm_with_options` helper It was redundant because `gfm` also took options. See merge request !1152
2015-08-18Fix infinite loop when SAML was incorrectly configured.Douwe Maan
2015-08-18Merge branch 'fix-backslashes-inline-diff' into 'master'Douwe Maan
Fix bug where backslashes in inline diffs could be dropped This MR fixes a bug in inline diff generation causing backslashes to be dropped. For example, the input: ``` input.to_s.sub(/[\r\n].+/,'').sub(/\\[rn].+/, '').strip ``` The second backslash is dropped in the second `sub` statement: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/16e513894f7ecda1b111fe7d43e7f388/image.png) With this fix, it looks like: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/90fd635a937a68f1b2403740ebc75e3a/image.png) Closes #2253 See merge request !1143
2015-08-17Merge branch 'master' into remove-satellitesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-14Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceStan Hu
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-14Clear cache to prevent listing deleted branches after MR removes source branchStan Hu
Closes #2272
2015-08-14Refactor pre/post receive commit services into one classDmitriy Zaporozhets
2015-08-14Fix tests for web editorDmitriy Zaporozhets
2015-08-14Disable pre-receive check in test envDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-14Merge branch 'disable-internal-tracker-when-external-in-use' into 'master'Dmitriy Zaporozhets
Disable internal issue tracker if external tracker in use ### What does this MR do? This MR disables routes to the internal issue tracker if an external issue tracker (e.g. Redmine) is in use. A 404 page is returned if a user attempts to access any of the issue routes. ### Why was this MR needed? Enabling the external issue tracker would still keep the internal one active, which would lead to odd behavior where users could create issues but not close them. ### What are the relevant issue numbers? Closes #2006 See merge request !993
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-13Remove the `gfm_with_options` helperRobert Speicher
It was redundant because `gfm` also took options.
2015-08-12markup_helper: detect .mkd and .mkdn as markdownBen Boeckel
2015-08-12Provide more feedback what went wrong if HipChat service failed testStan Hu
Issue gitlab-com/support-forum#213
2015-08-12Fix bug where backslashes in inline diffs could be droppedStan Hu
Closes #2253