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-24Fix Error 500 in API when accessing a group that has an avatarStan Hu
Closes #2340
2015-08-22Fix 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-21Fix blame view line groupingsStan Hu
Closes #2305
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-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-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
2015-08-12Add merged label on branches pageFlorent (HP)
2015-08-11Merge branch 'revert-satellites' into 'master' Dmitriy Zaporozhets
Revert satellites Return satellites to master for 7.14 We remove satellites in next release (8.0) See merge request !1136
2015-08-11Fix file api testsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11Revert "Merge branch 'web-editor-rugged' into 'master'"Dmitriy Zaporozhets
This reverts commit 5a1aa49b5533593dc4c6de82279fe44f5f15616c, reversing changes made to a675bea2c1c1d5d6923cb97b8714eb72d4e4ff9b. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
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-10Merge branch 'fix-diff-highlighting' into 'master'Douwe Maan
Fix diff syntax highlighting ### What does this MR do? This MR fixes a syntax highlighting issue that that manifested itself when a user tried the following: ``` +aaa +bbb ccc ``` However, a regression in 0abe98f0 caused the last line to be put on the second to last line: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/a16515499d5e3fd9737370d89c73f671/image.png) Instead of this: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/59eca6efd4c290aa633b9fb54c98a70e/image.png) This bug occurred because of some error in the logic of handling new lines in the content. Refactored HTML parser to avoid duplication of newline parsing. ### What are the relevant issue numbers? Closes #2235 See merge request !1126
2015-08-10Fix diff syntax highlightingStan Hu
Refactored HTML parser to avoid duplication of newline parsing. Closes #2235
2015-08-10Merge branch 'disable-autocrlf-for-binary-files' into 'master'Stan Hu
Fix corrupted binary files when using API files endpoint Closes #2219 See merge request !1123
2015-08-10Merge branch 'rs-reference-data-attrs' into 'master' Robert Speicher
Add `data-[type]-id` attribute to reference links This is to let us redact them later in another filter. See merge request !1110
2015-08-10Fix corrupted binary files when using API files endpointStan Hu
Add CHANGELOG for gitlab_git 7.2.9 updates Closes #2219
2015-08-08Add `data-[type]-id` attribute to reference linksRobert Speicher
This is to let us redact them later in another filter.
2015-08-08Merge branch 'merge-notifs' into 'master'Robert Speicher
See merge request !1077
2015-08-07Merge branch 'bitbucket-show-incompatible' into 'master'Douwe Maan
Show incompatible projects in Bitbucket import status ### What does this MR do? This MR displays incompatible Bitbucket projects (e.g. SVN, hg) in the status table. ### Why was this MR needed? Users are confused when they don't see projects show up. The import list should show incompatible projects as we do for Google Code to make it more obvious to the user what is happening. (See !586 and 9c76a6fa). ### Screenshot ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/264b080114c809c4a3a79580594af8b2/image.png) ### What are the relevant issue numbers? #1871 See merge request !1114
2015-08-07Show incompatible projects in Bitbucket import statusStan Hu
See #1871
2015-08-07Add `Group#add_*` convenience methodsRobert Speicher
Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.
2015-08-06Merge branch 'add-current-user-to-autocomplete' into 'master'Dmitriy Zaporozhets
Always add current user to autocomplete controller to support filter by "Me" ### What does this MR do? This MR always adds the current user to the autocomplete list of users. ### Why was this MR needed? Normally only the members from a team or the group are shown in the autocomplete list. However, this prevents a user from filtering issues belong to him/her if the user does not belong directly to either. To make this filtering more usable, we can be sure to add the current user to the list, which the JavaScript code will move to the top of the list. ### What are the relevant issue numbers? Partial fix #2202 See merge request !1100
2015-08-06Merge branch 'report-spam'Dmitriy Zaporozhets
2015-08-06Fix specDouwe Maan
2015-08-06Allow users to send abuse reportsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-06Merge branch 'master' into merge-notifsDouwe Maan
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-06Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master'Douwe Maan
Fix errors deleting, creating, and viewing graphs using branches with encoded slashes * Closes #1804 * Closes #1359 See merge request !1084
2015-08-06Always add current user to autocomplete controller to support filter by "Me"Stan Hu
Partial fix #2202
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-05Fix merge request creation without branch selectedDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
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-04Fix merge api and specDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-04Only publish ssh key-type and keyZeger-Jan van de Weg
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 21:07:04 +0300