summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'docs/personal-access-tokens' into 'master'9-3-stable-rc3-conflicts-docsSean Packham2017-06-1511-86/+162
* 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
| | * | | | | | | Expose avatar URL for groupsAlfredo Sumaran2017-06-062-2/+6
| | * | | | | | | Remove non existent bundleAlfredo Sumaran2017-06-062-2/+0
| | * | | | | | | Minor visual adjustmentsAlfredo Sumaran2017-06-069-22/+80
| | * | | | | | | Add json support to group members leave action in controllerDmitriy Zaporozhets2017-06-062-2/+14
| | * | | | | | | Improve pagination when searching or filteringAlfredo Sumaran2017-06-067-48/+130
| | * | | | | | | Merge remote-tracking branch 'origin/master' into 25426-group-dashboard-uiDmitriy Zaporozhets2017-06-022696-20334/+62396
| | |\ \ \ \ \ \ \
| | * | | | | | | | Use eventHub to update groups from GroupFilterableList classAlfredo Sumaran2017-06-014-22/+46
| | * | | | | | | | Make GroupsStore.store method non-staticAlfredo Sumaran2017-06-012-4/+6
| | * | | | | | | | Fix karma testsAlfredo Sumaran2017-05-311-8/+8
| | * | | | | | | | Move line to a better placeAlfredo Sumaran2017-05-311-3/+2
| | * | | | | | | | Use webpack_bundle_tag instead of deprecated page_specific_javascript_bundle_tagAlfredo Sumaran2017-05-311-2/+2
| | * | | | | | | | Use map to iterate arraysAlfredo Sumaran2017-05-311-3/+3
| | * | | | | | | | Remove default null value for parent paramAlfredo Sumaran2017-05-311-1/+1