summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '26943-fix-user-in-build-presenter' into 'master' Robert Speicher2017-01-273-17/+19
|\
| * Raise Gitlab::View::Presenter::CannotOverrideMethodError if presentee already...26943-fix-user-in-build-presenterRémy Coutable2017-01-251-4/+3
| * Don't override presentee methods for Gitlab::View::Presenter::DelegatedRémy Coutable2017-01-243-17/+20
* | Merge branch 'fix-trace-reader-encoding' into 'master' Douwe Maan2017-01-261-2/+14
|\ \
| * | Make sure TraceReader uses Encoding.default_externalfix-trace-reader-encodingLin Jen-Shin2017-01-261-2/+14
* | | 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
* | | | 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 'copy-as-md' into 'master' Jacob Schatz2017-01-251-4/+4
|\ \ \
| * \ \ Merge branch 'master' into copy-as-mdDouwe Maan2017-01-252-20/+72
| |\ \ \
| * \ \ \ Merge branch 'master' into copy-as-mdDouwe Maan2017-01-2417-123/+806
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into copy-as-mdDouwe Maan2017-01-1932-137/+525
| |\ \ \ \ \
| * | | | | | Fix SyntaxHighlightFilter specDouwe Maan2017-01-171-4/+4
* | | | | | | Merge branch 'refresh-authorizations-fork-join' into 'master' Douwe Maan2017-01-254-0/+106
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix race conditions for AuthorizedProjectsWorkerrefresh-authorizations-fork-joinYorick Peterse2017-01-254-0/+106
* | | | | | | Merge branch 'no_project_notes' into 'master' Sean McGivern2017-01-251-0/+24
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | address commentsJarka Kadlecova2017-01-251-0/+3
| * | | | | | make mentions working when project not specifiedJarka Kadlecova2017-01-181-0/+21
* | | | | | | Merge branch 'dont-persist-application-settings-in-test-env-bis' into 'master' Robert Speicher2017-01-241-20/+48
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Revert "Merge branch 'revert-9cac0317' into 'master' "Grzegorz Bizon2017-01-231-20/+48
* | | | | | | Merge branch '24833-Allow-to-search-by-commit-hash-within-project' into 'mast...Sean McGivern2017-01-241-0/+115
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Allows to search within project by commit's hashYarNayar2017-01-241-0/+115
* | | | | | | Merge branch '22619-add-an-email-address-to-unsubscribe-list-header-in-email'...Douwe Maan2017-01-235-3/+106
|\ \ \ \ \ \ \
| * | | | | | | Handles unsubscribe from notifications via emailPawel Chojnacki2017-01-135-3/+106
* | | | | | | | Merge branch '22638-creating-a-branch-matching-a-wildcard-fails' into 'master' Douwe Maan2017-01-231-1/+8
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Allow creating protected branch when it doesn't existPawel Chojnacki2017-01-131-1/+8
* | | | | | | | Merge branch 'feature/success-warning-icons-in-stages-builds' into 'master' Kamil Trzciński2017-01-237-110/+471
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Extend pipeline detailed status factory specsGrzegorz Bizon2017-01-121-17/+28
| * | | | | | | Fix a Rubocop offense in detailed status factoryGrzegorz Bizon2017-01-121-1/+1
| * | | | | | | Use detailed status for failed but allowed buildsGrzegorz Bizon2017-01-121-12/+113
| * | | | | | | Expose methods that match statuses in status factoriesGrzegorz Bizon2017-01-121-17/+45
| * | | | | | | Make it possible to combine extended CI/CD statusesGrzegorz Bizon2017-01-121-7/+90
| * | | | | | | Add extended status for build failed but allowed toGrzegorz Bizon2017-01-111-0/+110
| * | | | | | | Add specs for two new methods defined in stage classGrzegorz Bizon2017-01-111-1/+0
| * | | | | | | Add concrete success warning status to stage factoryGrzegorz Bizon2017-01-114-71/+100
| * | | | | | | Extract abstract success with warnings CI/CD statusGrzegorz Bizon2017-01-112-2/+2
* | | | | | | | Revert "Merge branch 'dont-persist-application-settings-in-test-env' into 'ma...Grzegorz Bizon2017-01-211-48/+20
* | | | | | | | Merge branch 'fix/import-users' into 'master' Rémy Coutable2017-01-202-9/+83
|\ \ \ \ \ \ \ \
| * | | | | | | | fix member mapper specfix/import-usersJames Lopez2017-01-201-24/+1
| * | | | | | | | fix and refactor note user mappingJames Lopez2017-01-182-9/+38
| * | | | | | | | added spec replicating the problemJames Lopez2017-01-182-2/+59
| * | | | | | | | do not map usersat all unless adminJames Lopez2017-01-181-1/+12
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'dont-persist-application-settings-in-test-env' into 'master' Robert Speicher2017-01-201-20/+48
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Don't persist ApplicationSetting in test envdont-persist-application-settings-in-test-envRémy Coutable2017-01-151-20/+48
| |/ / / / / /
* | | | | | | Merge branch 'feature/gitaly-feature-flag' into 'master' Robert Speicher2017-01-191-0/+23
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Pass Gitaly resource path to gitlab-workhorse if Gitaly is enabledfeature/gitaly-feature-flagAhmad Sherif2017-01-181-0/+23
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '23563-document-presenters' into 'master' Dmitriy Zaporozhets2017-01-194-0/+147
|\ \ \ \ \ \
| * | | | | | More improvements to presenters23563-document-presentersRémy Coutable2017-01-184-50/+51
| * | | | | | Improve presenter factoryRémy Coutable2017-01-182-48/+42
View Lorry Controller Status