summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Resolve conflicts in job entity specsGrzegorz Bizon2017-06-191-26/+1
* Merge branch 'fix-external-ci-services' into 'master'Grzegorz Bizon2017-06-1910-93/+251
* Merge branch 'tc-fix-group-finder-subgrouping' into 'master'Douwe Maan2017-06-193-11/+87
* Merge branch '9-3-stable-rc3-i18n' into '9-3-stable-rc4'Clement Ho2017-06-1928-507/+300
|\
| * Merge branch 'bvl-missing-translations' into 'master'9-3-stable-rc3-i18nDouwe Maan2017-06-161-1/+1
| * Revert 'New file from interface on existing branch'Douwe Maan2017-06-159-399/+4
| * Merge branch 'sh-recaptcha-fix-try2' into 'master'Sean McGivern2017-06-151-0/+1
| * Merge branch 'fix-filename-of-artifact-uploader' into 'master'Grzegorz Bizon2017-06-152-2/+39
| * Merge branch 'rc/load-images-in-phantomjs' into 'master'Robert Speicher2017-06-153-12/+9
| * Merge branch 'sh-fix-refactor-uploader-work-dir' into 'master'Kamil Trzciński2017-06-153-19/+50
| * Merge branch '29010-perf-bar' into 'master'Robert Speicher2017-06-152-1/+82
| * Merge branch 'port-post-receive-changes' into 'master'Robert Speicher2017-06-151-16/+13
| * Merge branch 'zj-raise-etag-route-regex-miss' into 'master'Kamil Trzciński2017-06-152-52/+25
| * Merge branch '33483-fix-note-highlight-being-lost-on-note-update' into 'master'Phil Hughes2017-06-151-0/+45
| * Merge branch '33529-fix-autocomplete-atwho-not-showing-on-note-edit-form' int...Clement Ho2017-06-151-0/+17
| * Merge branch 'fix-manual-actions' into 'master'Grzegorz Bizon2017-06-153-3/+19
| * Merge branch 'fix/gb/remove-invalid-build-details-exposure' into 'master'Kamil Trzciński2017-06-151-1/+1
| * Merge branch '33642-timeago-update' into 'master'Phil Hughes2017-06-151-12/+1
| * Merge branch 'instrument-merge-request-diff-load-commits' into 'master'Sean McGivern2017-06-151-0/+1
| * Merge branch 'dm-fix-parser-cache' into 'master'Sean McGivern2017-06-151-1/+1
* | 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