summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Add the rspec_profiling gem and documentation to the GitLab development envir...23034-enable-rspec-profilingNick Thomas2017-01-271-0/+4
* Merge branch 'add_project_update_hook' into 'master' Rémy Coutable2017-01-261-0/+2
|\
| * Add a system hook for when a project is updated.Tommy Beadle2017-01-261-0/+2
* | Merge branch '27285-fix-broken-master' into 'master' Sean McGivern2017-01-261-2/+1
|\ \ | |/ |/|
| * Ensure we have a project with a repo in GitlabMarkdownHelper specsRémy Coutable2017-01-261-2/+1
* | Merge branch 'rs-empty_project-lib' into 'master' Rémy Coutable2017-01-2665-103/+114
|\ \ | |/ |/|
| * Use `:empty_project` where possible throughout spec/librs-empty_project-libRobert Speicher2017-01-2565-103/+114
* | Merge branch '26068_tasklist_issue' into 'master' Sean McGivern2017-01-261-0/+19
|\ \
| * | Don’t count tasks that are not defined as list items correctlyJarka Kadlecova2017-01-251-0/+19
* | | Revert "Make sure TraceReader uses Encoding.default_external"Lin Jen-Shin2017-01-261-14/+2
* | | Make sure TraceReader uses Encoding.default_externalLin Jen-Shin2017-01-261-2/+14
* | | Merge branch 'rs-empty_project-for-associations' into 'master' Rémy Coutable2017-01-2617-19/+27
|\ \ \
| * | | Use a project factory with a repository where necessaryrs-empty_project-for-associationsRobert Speicher2017-01-254-5/+12
| * | | Factories with a project association use `:empty_project` by defaultRobert Speicher2017-01-2414-14/+15
* | | | Merge branch 'rs-empty_project-helpers' into 'master' Rémy Coutable2017-01-2614-40/+41
|\ \ \ \
| * | | | Use `:empty_project` where possible in helper specsrs-empty_project-helpersRobert Speicher2017-01-2514-40/+41
| |/ / /
* | | | Merge branch 'rs-empty_project-controllers' into 'master' Rémy Coutable2017-01-2643-74/+67
|\ \ \ \
| * | | | Use `empty_project` where possible in controller specsrs-empty_project-controllersRobert Speicher2017-01-2543-74/+67
| |/ / /
* | | | Use `:empty_project` where possible in finder specsrs-empty_project-findersRobert Speicher2017-01-2510-23/+23
* | | | Merge branch 'fix/26518' into 'master' Douwe Maan2017-01-251-0/+22
|\ \ \ \
| * | | | Fix access to the wiki code via HTTP when repository feature disabledDouglas Barbosa Alexandre2017-01-251-0/+22
* | | | | Merge branch 'copy-as-md' into 'master' Jacob Schatz2017-01-253-13/+448
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into copy-as-mdDouwe Maan2017-01-2529-74/+603
| |\ \ \ \ \ | | |/ / / /
| * | | | | Run tests in a single browser sessionDouwe Maan2017-01-241-66/+81
| * | | | | Merge branch 'master' into copy-as-mdDouwe Maan2017-01-2490-470/+2116
| |\ \ \ \ \
| * | | | | | Improve handling of code blocks containing triple backticksDouwe Maan2017-01-191-1/+11
| * | | | | | Improve support for linebreaks, tables and nested blockquotes in listsDouwe Maan2017-01-191-7/+22
| * | | | | | Merge branch 'master' into copy-as-mdDouwe Maan2017-01-19126-657/+2978
| |\ \ \ \ \ \
| * | | | | | | Properly copy/paste allowed HTMLDouwe Maan2017-01-191-0/+31
| * | | | | | | Satisfy RubocopDouwe Maan2017-01-181-2/+0
| * | | | | | | Move some functions to utilsDouwe Maan2017-01-181-2/+2
| * | | | | | | Add more SyntaxHighlightFilter and MathFilter testsDouwe Maan2017-01-171-16/+141
| * | | | | | | Fix ShortcutsIssuable#replyWithSelectedText testsDouwe Maan2017-01-171-9/+12
| * | | | | | | Fix SyntaxHighlightFilter specDouwe Maan2017-01-171-4/+4
| * | | | | | | Improve specDouwe Maan2017-01-161-151/+155
| * | | | | | | Copying a rendered issue/comment will paste into GFM textareas as actual GFMDouwe Maan2017-01-161-0/+234
* | | | | | | | Merge branch 'refresh-authorizations-fork-join' into 'master' Douwe Maan2017-01-258-1/+135
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix race conditions for AuthorizedProjectsWorkerrefresh-authorizations-fork-joinYorick Peterse2017-01-258-1/+135
* | | | | | | | | Merge branch 'label-select-toggle' into 'master' kamil-test-branchFatih Acet2017-01-251-0/+16
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Fixed label select toggle not updating correctlylabel-select-togglePhil Hughes2017-01-161-0/+16
* | | | | | | | | Merge branch '26775-fix-auto-complete-initial-loading' into 'master' Fatih Acet2017-01-251-0/+26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix autocomplete initial undefined state26775-fix-auto-complete-initial-loadingEric Eastwood2017-01-231-0/+26
* | | | | | | | | | Merge branch 'fix-ci-requests-concurrency' into 'master' Grzegorz Bizon2017-01-252-1/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Return struct instead of multiple valuesKamil Trzcinski2017-01-251-1/+1
| * | | | | | | | | | Add 409 conflict testsfix-ci-requests-concurrencyKamil Trzcinski2017-01-251-0/+14
| * | | | | | | | | | Fix specsKamil Trzcinski2017-01-251-1/+1
* | | | | | | | | | | Merge branch 'backport-ee-changes-for-build-minutes' into 'master' Grzegorz Bizon2017-01-255-29/+85
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | / / / | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Remove unneeded code and fix offensesbackport-ee-changes-for-build-minutesKamil Trzcinski2017-01-251-47/+0
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into backport-ee-changes-for-bui...Kamil Trzcinski2017-01-2451-262/+1558
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Backport changes introduced by https://gitlab.com/gitlab-org/gitlab-ee/merge_...Kamil Trzcinski2017-01-206-29/+132
View Lorry Controller Status