summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '33779-reset-session-before-blocking-requests' into 'master'Robert Speicher2017-06-172-6/+9
* Merge branch 'sh-fix-issue-33756' into 'master'Rémy Coutable2017-06-171-4/+4
* Merge branch 'rc/load-images-in-phantomjs' into 'master'Robert Speicher2017-06-163-12/+9
* Fix bad merge9-3-stable-rc2Clement Ho2017-06-091-1/+1
* remove lines that were incorrectly reinserted after 4f824d2aMike Greiling2017-06-091-3/+1
* Remove duplicate methodClement Ho2017-06-091-6/+0
* resolve more inconsistenciesMike Greiling2017-06-092-19/+1
* Resolve inconsistenciesClement Ho2017-06-094-201/+0
* Merge commit 'b1bf6d88fceb24663bfe4be2d9cc111710d9126b' into 9-3-stableClement Ho2017-06-0927-128/+507
|\
| * Merge branch 'master-security-update' into 'master'Regis Boudinot2017-06-0828-41/+748
| |\
| | * Merge remote-tracking branch 'origin/upstream-9-2-security' into master-secur...master-security-updateDJ Mountney2017-06-081-5/+7
| | |\
| | | * Update rename_system_namespace_spec to new validations.upstream-9-2-securityBob Van Landuyt2017-06-081-5/+7
| | | * Bring in security changes from the 9.2.5 releaseDJ Mountney2017-06-0828-41/+746
| | * | Merge branch 'upstream-9-2-security' into master-security-updateDJ Mountney2017-06-0823-23/+500
| | |\ \
| | | * | Bring in security changes from the 9.2.5 releaseDJ Mountney2017-06-0728-41/+746
| | * | | Merge branch '25934-project-snippet-vis' into 'security-9-2'DJ Mountney2017-06-083-8/+187
| | * | | Merge branch 'dz-restrict-autocomplete' into 'security-9-1'DJ Mountney2017-06-081-10/+20
| | * | | Merge branch 'cherry-pick-dc2ac993' into 'security-9-2'DJ Mountney2017-06-081-0/+39
| * | | | Merge branch '25426-group-dashboard-ui' into 'master'Douwe Maan2017-06-087-20/+394
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into 25426-group-dashboard-ui25426-group-dashboard-uiAlfredo Sumaran2017-06-0816-79/+402
| | |\ \ \ \
| | * | | | | Add tests when user has no direct acces to a groupAlfredo Sumaran2017-06-081-0/+31
| | * | | | | Display user access type for each groupAlfredo Sumaran2017-06-072-4/+5
| | * | | | | Add feature tests for Dashboard Groups pageAlfredo Sumaran2017-06-071-19/+103
| | * | | | | Merge branch 'master' into 25426-group-dashboard-uiAlfredo Sumaran2017-06-07225-1731/+6407
| | |\ \ \ \ \
| | * | | | | | Address feedbackAlfredo Sumaran2017-06-073-0/+16
| | * | | | | | Fix failing specAlfredo Sumaran2017-06-071-1/+1
| | * | | | | | Address feedbackAlfredo Sumaran2017-06-073-29/+54
| | * | | | | | Remove non existent bundleAlfredo Sumaran2017-06-061-1/+0
| | * | | | | | Minor visual adjustmentsAlfredo Sumaran2017-06-062-2/+2
| | * | | | | | Add json support to group members leave action in controllerDmitriy Zaporozhets2017-06-061-0/+7
| | * | | | | | Merge remote-tracking branch 'origin/master' into 25426-group-dashboard-uiDmitriy Zaporozhets2017-06-02800-5887/+28067
| | |\ \ \ \ \ \
| | * | | | | | | Make GroupsStore.store method non-staticAlfredo Sumaran2017-06-011-1/+3
| | * | | | | | | Fix karma testsAlfredo Sumaran2017-05-311-8/+8
| | * | | | | | | Fix tests and eslint errorsAlfredo Sumaran2017-05-303-2/+14
| | * | | | | | | Add tests for Group item componentAlfredo Sumaran2017-05-253-38/+157
| | * | | | | | | Add basic tests for groups componentAlfredo Sumaran2017-05-222-0/+78
| * | | | | | | | Merge branch 'ce#31853-projects-shared-groups' into 'master'Annabel Dunstone Gray2017-06-081-3/+6
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix specsce#31853-projects-shared-groupsAnnabel Dunstone Gray2017-06-081-2/+2
| | * | | | | | | | fixes project_group_links spec by adding click tab eventtauriedavis2017-06-081-1/+4
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'unicorn-test-boot-timeout' into 'master'Douwe Maan2017-06-081-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Increase unicorn test boot timeout to 5 minutesJacob Vosmaer2017-06-081-2/+2
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge branch 'dm-blob-file-type' into 'master'Grzegorz Bizon2017-06-081-0/+8
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Add Blob#file_type convenience methoddm-blob-file-typeDouwe Maan2017-06-081-0/+8
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch 'dm-diff-file-diffable' into 'master'Sean McGivern2017-06-084-56/+29
| |\ \ \ \ \ \ \
| | * | | | | | | Move diffable? method from Repository to Diff::Filedm-diff-file-diffableDouwe Maan2017-06-084-56/+29
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Use Diff::File blob methods from diff highlighterdm-highlight-diff-file-blobDouwe Maan2017-06-081-24/+13
| | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'allow-reporters-to-promote-group-labels' into 'master'Douwe Maan2017-06-081-3/+3
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Allow group reporters to promote labelsallow-reporters-to-promote-group-labelsSean McGivern2017-06-081-3/+3
| * | | | | | Merge branch 'blob-load-all-data' into 'master'Grzegorz Bizon2017-06-081-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Blob#load_all_data! doesn’t need an argumentblob-load-all-dataDouwe Maan2017-06-071-1/+1
| | | |_|/ / | | |/| | |
View Lorry Controller Status