summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 9.3.0-rc3v9.3.0-rc39-3-stable-rc4Clement Ho2017-06-181-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-164-13/+12
* Merge branch 'rs-revert-11842' into 'master'Stan Hu2017-06-161-2/+1
* Update VERSION to 9.3.0-rc2v9.3.0-rc2kushalpandya2017-06-161-1/+1
* Merge branch 'winh-ignore-CVE-2017-5029' into 'master'Robert Speicher2017-06-131-1/+1
* Merge branch 'cache-diff-size-limits' into 'master'Douwe Maan2017-06-131-2/+18
* Merge branch '9-3-stable-rc2' into '9-3-stable'Kushal Pandya2017-06-102433-16873/+48517
|\
| * Fix bad merge9-3-stable-rc2Clement Ho2017-06-093-20/+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-0913-423/+3
| * Merge commit 'b1bf6d88fceb24663bfe4be2d9cc111710d9126b' into 9-3-stableClement Ho2017-06-09137-687/+5025
| |\
| | * Merge branch 'master-security-update' into 'master'Regis Boudinot2017-06-0855-66/+1256
| | |\
| | | * Merge remote-tracking branch 'origin/upstream-9-2-security' into master-secur...master-security-updateDJ Mountney2017-06-082-6/+10
| | | |\
| | | | * Update rename_system_namespace_spec to new validations.upstream-9-2-securityBob Van Landuyt2017-06-081-5/+7
| | | | * Make the uploader use the updated folderBob Van Landuyt2017-06-081-1/+3
| | | | * Bring in security changes from the 9.2.5 releaseDJ Mountney2017-06-0855-66/+1252
| | | * | Merge branch 'upstream-9-2-security' into master-security-updateDJ Mountney2017-06-0837-35/+983
| | | |\ \
| | | | * | Bring in security changes from the 9.2.5 releaseDJ Mountney2017-06-0755-66/+1252
| | | * | | Merge branch '25934-project-snippet-vis' into 'security-9-2'DJ Mountney2017-06-0813-18/+206
| | | * | | Merge branch 'dz-api-x-frame' into 'security-9-2'DJ Mountney2017-06-081-0/+1
| | | * | | Merge branch 'dz-restrict-autocomplete' into 'security-9-1'DJ Mountney2017-06-082-11/+21
| | | * | | Merge branch 'cherry-pick-dc2ac993' into 'security-9-2'DJ Mountney2017-06-082-2/+41
| | * | | | Merge branch 'evn-no-geo-either' into 'master'Stan Hu2017-06-081-1/+2
| | |\ \ \ \
| | | * | | | Update per discussionevn-no-geo-eitherernstvn2017-06-081-1/+1
| | | * | | | GitLab GEO also does not support mysql replicationernstvn2017-06-051-1/+2
| | * | | | | Merge branch '25426-group-dashboard-ui' into 'master'Douwe Maan2017-06-0830-66/+1434
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'master' into 25426-group-dashboard-ui25426-group-dashboard-uiAlfredo Sumaran2017-06-08181-825/+5667
| | | |\ \ \ \ \
| | | * | | | | | Add tests when user has no direct acces to a groupAlfredo Sumaran2017-06-082-2/+33
| | | * | | | | | Align folder and carets on groups treeAlfredo Sumaran2017-06-081-1/+1
| | | * | | | | | Update URL when paginating groupsAlfredo Sumaran2017-06-081-1/+6
| | | * | | | | | Add missing aria-hidden attribute to i tagsAlfredo Sumaran2017-06-081-8/+21
| | | * | | | | | Fix type casingAlfredo Sumaran2017-06-081-2/+2
| | | * | | | | | Do not show access type to a group if there’s no accessAlfredo Sumaran2017-06-081-0/+2
| | | * | | | | | Display user access type for each groupAlfredo Sumaran2017-06-074-4/+10
| | | * | | | | | Add feature tests for Dashboard Groups pageAlfredo Sumaran2017-06-071-19/+103
| | | * | | | | | Expose human group access on GroupEntityDouwe Maan2017-06-071-2/+2
| | | * | | | | | Use group and project finders instead of direct ActiveRecord relationsDouwe Maan2017-06-072-12/+13
| | | * | | | | | Merge branch 'master' into 25426-group-dashboard-uiAlfredo Sumaran2017-06-07827-4715/+15044
| | | |\ \ \ \ \ \
| | | * | | | | | | Address feedbackAlfredo Sumaran2017-06-076-3/+18
| | | * | | | | | | Turn off every event on beforeDestroyAlfredo Sumaran2017-06-071-0/+8
| | | * | | | | | | Add CHANGELOG entryAlfredo Sumaran2017-06-071-0/+4
| | | * | | | | | | Fix failing specAlfredo Sumaran2017-06-071-1/+1
| | | * | | | | | | Restore code to make explore groups workAlfredo Sumaran2017-06-074-1/+23
| | | * | | | | | | Address feedbackAlfredo Sumaran2017-06-079-99/+167
| | | * | | | | | | Add rows hover state and improve layout for mobileAlfredo Sumaran2017-06-063-60/+78
| | | * | | | | | | Do not show spinner when fetching subgroupsAlfredo Sumaran2017-06-061-2/+2
View Lorry Controller Status