summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into merge-notifsmerge-notifsDouwe Maan2015-08-0633-601/+764
|\
| * Merge branch 'remove-email-from-published-keys' into 'master'Douwe Maan2015-08-063-1/+19
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Only publish ssh key-type and keyZeger-Jan van de Weg2015-08-043-1/+19
| | |
| * | Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master'Douwe Maan2015-08-062-0/+30
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix errors deleting, creating, and viewing graphs using branches with encoded slashes * Closes #1804 * Closes #1359 See merge request !1084
| | * | Fix "Network" and "Graphs" pages for branches with encoded slashesStan Hu2015-08-021-0/+10
| | | | | | | | | | | | | | | | Closes #1359
| | * | Fix errors deleting and creating branches with encoded slashesStan Hu2015-08-011-0/+20
| | | | | | | | | | | | | | | | Closes #1804
| * | | Merge branch 'drop-satellites'Dmitriy Zaporozhets2015-08-0513-258/+30
| |\ \ \
| | * | | Fix merge request creation without branch selectedDmitriy Zaporozhets2015-08-051-5/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Improve tests to use real branches in merge requestsDmitriy Zaporozhets2015-08-044-13/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-0446-809/+1251
| | |\ \ \ | | | | |/ | | | |/| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Fix merge api and specDmitriy Zaporozhets2015-08-041-14/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Fix some of testsDmitriy Zaporozhets2015-07-163-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Remove satellitesDmitriy Zaporozhets2015-07-154-222/+1
| | | | |
| * | | | Merge branch 'revert_touch' into 'master' Sytse Sijbrandij2015-08-052-5/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Revert "Update noteable after a new note is added"revert_touchValery Sizov2015-08-052-5/+1
| | | |/ / | | |/| | | | | | | | | | | | This reverts commit fbdaf0e2a517660c0e4e3960f20b2d3568c33e78.
| * | | | Add "Confirm user" button in user admin pageStan Hu2015-08-052-0/+27
| |/ / / | | | | | | | | | | | | | | | | Closes #2116 Closes https://github.com/gitlabhq/gitlabhq/issues/9502
| * | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-08-0312-324/+615
| |\ \ \
| | * \ \ Merge branch 'master' of github.com:gitlabhq/gitlabhqStan Hu2015-08-024-3/+9
| | |\ \ \
| | | * | | Re-annotate modelsAtsushi Ishida2015-08-034-3/+9
| | | | |/ | | | |/|
| | * | | Merge branch 'api-useremails' into 'master' Robert Speicher2015-07-311-0/+171
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Add ability to manage user email addresses via the API. Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2181 See merge request !1066
| | | * | Merge branch 'master' into api-useremailsDouwe Maan2015-07-317-321/+417
| | | |\ \
| | | * | | Fix docsDouwe Maan2015-07-301-1/+1
| | | | | |
| | | * | | Add ability to manage user email addresses via the API.Douwe Maan2015-07-291-0/+171
| | | | | |
| | * | | | Fix multi-line syntax highlightingStan Hu2015-07-301-0/+18
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTML span elements only apply to a single line, and in the case of multi-line comments, the highlighting was dropped as a result. Ensure that each line has the proper styling to fix this. Closes #1577
| | * | | Merge branch 'rs-mr-1050-followup' into 'master' Robert Speicher2015-07-311-0/+16
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add spec to RelativeLinkFilter for Unicode filenames Adds specs for changes added in !1050 See merge request !1078
| | | * | | Add spec to RelativeLinkFilter for Unicode filenamesRobert Speicher2015-07-301-0/+16
| | | | | |
| | * | | | Merge branch 'rs-markdown-feature-pipelines' into 'master' Robert Speicher2015-07-314-314/+388
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare Markdown feature spec for testing multiple pipelines This MR lays the groundwork for including or excluding certain HTML::Pipeline filters depending on what we're parsing. For example, excluding reference filters in the Issues and Merge Requests titles. See merge request !1053
| | | * | | | Fix setup/teardown for Markdown feature specrs-markdown-feature-pipelinesRobert Speicher2015-07-292-24/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior, CI seemed to be freezing after running these specs.
| | | * | | | Update Markdown feature to allow for multiple pipelinesRobert Speicher2015-07-282-163/+209
| | | | | | |
| | | * | | | Add RelativeLinkFilter section to Markdown fixtureRobert Speicher2015-07-281-0/+7
| | | | | | |
| | | * | | | Move MarkdownFeature to its own support fileRobert Speicher2015-07-282-115/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This file's about to get much bigger and this removes some of the extra noise.
| | | * | | | Make links inside ignored elements uniqueRobert Speicher2015-07-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to prevent false matches since the Autolink section uses about.gitlab.com as well.
| | | * | | | Break up SanitizationFilter feature specsRobert Speicher2015-07-281-16/+37
| | | | | | |
| | | * | | | Use aggregate_failures where appropriateRobert Speicher2015-07-281-34/+53
| | | | | | |
| | | * | | | Minor Markdown feature spec reorganizationRobert Speicher2015-07-281-46/+47
| | | | | | |
| | | * | | | Simplify AutolinkFilter specsRobert Speicher2015-07-281-16/+12
| | | | |/ / | | | |/| |
| | * | | | Merge branch 'api-new-attributes' into 'master' Robert Speicher2015-07-301-6/+12
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Add project star and fork count, group avatar URL and user/group web URL attributes to API Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2521. See merge request !1058
| | | * | | Fix specsDouwe Maan2015-07-291-6/+12
| | | |/ /
| * | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵Jacob Vosmaer2015-07-2924-461/+469
| |\ \ \ \ | | | |/ / | | |/| | | | | | | backup-archive-permissions
| * | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵Jacob Vosmaer2015-07-2747-99/+640
| |\ \ \ \ | | | | | | | | | | | | | | | | | | backup-archive-permissions
| * | | | | Use a separate backup test directory and nuke its contentsJacob Vosmaer2015-07-242-6/+9
| | | | | |
| * | | | | Create more backups during backup testsJacob Vosmaer2015-07-241-13/+11
| | | | | | | | | | | | | | | | | | | | | | | | I hope this makes the backup tests more reliable.
| * | | | | Use a loop when enabling subtasksJacob Vosmaer2015-07-101-3/+3
| | | | | |
| * | | | | Remove rake task re-enabling into a methodJacob Vosmaer2015-07-091-6/+8
| | | | | |
| * | | | | More hacks to get the specs working againJacob Vosmaer2015-07-081-0/+3
| | | | | |
| * | | | | Add tests for custom backup archive file permissionsJacob Vosmaer2015-07-071-4/+27
| | | | | |
* | | | | | Send notification to all participants when MR is merged.Douwe Maan2015-07-301-1/+6
| |_|_|/ / |/| | | |
* | | | | Check that project was actually created rather than just validated in ↵Stan Hu2015-07-291-1/+1
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | import:repos task Add gitlab-shell to error message to give user a clue that something may be wrong there. Ran into this in #2082. User was told that repositories were created when they were not due to hooks symlink being wrong.
* | | | Change before(:all) -> let! to avoid leaking data across testsStan Hu2015-07-281-15/+15
| | | | | | | | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9495
* | | | Merge branch 'fix-api-mr-notes-ordering' into 'master'Douwe Maan2015-07-281-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return comments in created order in merge request API Closes #1832 See merge request !985
View Lorry Controller Status