summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge branch 'dm-blob-binaryness-change' into 'master'Sean McGivern2017-06-092-5/+36
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Detect if blob binaryness changes after loading all data See merge request !11981
| * | | | | Detect if file that appears to be text in the first 1024 bytes is actually ↵dm-blob-binaryness-changeDouwe Maan2017-06-082-5/+36
| | | | | | | | | | | | | | | | | | | | | | | | binary afer loading all data
* | | | | | Merge branch 'issuable-sidebar-edit-button-field-focus' into 'master'Filipa Lacerda2017-06-091-1/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed dropdown filter input not focusing after transition Closes #33216 See merge request !12020
| * | | | | Fixed dropdown filter input not focusing after transitionissuable-sidebar-edit-button-field-focusPhil Hughes2017-06-081-1/+3
| | |/ / / | |/| | | | | | | | | | | | | Closes #33216
* | | | | Merge branch 'port-post-receive-changes' into 'master'Robert Speicher2017-06-081-16/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refactor PostReceive worker to limit merge conflicts See merge request !11916
| * | | | | Refactor PostReceive worker to limit merge conflictsport-post-receive-changesDouglas Barbosa Alexandre2017-06-051-16/+13
| | | | | |
* | | | | | Merge branch 'use-request-store-on-mr-controller-query-count-spec' into 'master'Douwe Maan2017-06-081-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use RequestStore on MR show.json query count spec See merge request !12024
| * | | | | | Use RequestStore on MR show.json query count specuse-request-store-on-mr-controller-query-count-specOswaldo Ferreira2017-06-081-1/+6
| | | | | | |
* | | | | | | Merge branch 'master-security-update' into 'master'Regis Boudinot2017-06-0828-41/+748
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Master security update See merge request !12025
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/upstream-9-2-security' into ↵master-security-updateDJ Mountney2017-06-081-5/+7
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | master-security-update
| | * | | | | | | 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
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ran: - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch - git checkout -b 9-2-5-security-patch origin/v9.2.2 - git apply patchfile.patch - git commit - [Got the sha ref for the commit] - git checkout -b upstream-9-2-security master - git cherry-pick <SHA of the patchfile commit> - [Resolved conflicts] - git cherry-pick --continue
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ran: - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch - git checkout -b 9-2-5-security-patch origin/v9.2.2 - git apply patchfile.patch - git commit - [Got the sha ref for the commit] - git checkout -b upstream-9-2-security master - git cherry-pick <SHA of the patchfile commit> - [Resolved conflicts] - git cherry-pick --continue
| * | | | | | | | Merge branch '25934-project-snippet-vis' into 'security-9-2'DJ Mountney2017-06-083-8/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix visibility when referencing snippets See merge request !2101
| * | | | | | | | Merge branch 'dz-restrict-autocomplete' into 'security-9-1'DJ Mountney2017-06-081-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users autocomplete by author_id only for authenticated users See merge request !2100
| * | | | | | | | Merge branch 'cherry-pick-dc2ac993' into 'security-9-2'DJ Mountney2017-06-081-0/+39
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Escapes html content before appending it to the DOM See merge request !2107
* | | | | | | | Merge branch '25426-group-dashboard-ui' into 'master'Douwe Maan2017-06-087-20/+394
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Group dashboard UI" Closes #25426 See merge request !11098
| * \ \ \ \ \ \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds unit tests for this
| * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into 25426-group-dashboard-uiDmitriy Zaporozhets2017-06-02800-5887/+28067
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | Add tests for Group item componentAlfredo Sumaran2017-05-253-38/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds more tests fro groups folder component [ci skip]
| * | | | | | | | | | | Add basic tests for groups componentAlfredo Sumaran2017-05-222-0/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | Merge branch 'ce#31853-projects-shared-groups' into 'master'Annabel Dunstone Gray2017-06-081-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31853 Remove duplication for sharing projects with groups in project settings Closes #31853 See merge request !11951
| * | | | | | | | | | | 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 minutes See merge request !12022
| * | | | | | | | | | | 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 method See merge request !11982
| * | | | | | | | | | 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::File See merge request !11980
| * | | | | | | | | | 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 labels See merge request !12006
| * | | | | | | | Allow group reporters to promote labelsallow-reporters-to-promote-group-labelsSean McGivern2017-06-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They can admin group labels anyway, we weren't checking the more specific permission.
* | | | | | | | | Merge branch 'blob-load-all-data' into 'master'Grzegorz Bizon2017-06-081-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Blob#load_all_data! doesn’t need an argument See merge request !11977
| * | | | | | | | Blob#load_all_data! doesn’t need an argumentblob-load-all-dataDouwe Maan2017-06-071-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch '12614-fix-long-message' into 'master'Dmitriy Zaporozhets2017-06-081-2/+24
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix long urls in the title of commit Closes #12614 See merge request !10938
View Lorry Controller Status