summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '33676-update-ruby-metrics-endpoint-text' into 'master'Jacob Schatz2017-06-191-2/+3
* Merge branch 'fix-external-ci-services' into 'master'Grzegorz Bizon2017-06-1913-19/+19
* Merge branch 'tc-fix-group-finder-subgrouping' into 'master'Douwe Maan2017-06-191-3/+15
* Merge branch '33819-authorby' into 'master'Douwe Maan2017-06-191-1/+1
* Merge branch 'bvl-missing-translations' into 'master'9-3-stable-rc3-i18nDouwe Maan2017-06-1621-68/+82
* Revert 'New file from interface on existing branch'Douwe Maan2017-06-1517-317/+15
* Merge branch 'sh-recaptcha-fix-try2' into 'master'Sean McGivern2017-06-151-1/+9
* Merge branch '33629-scroll-color' into 'master'Phil Hughes2017-06-151-1/+1
* Merge branch '33639-whitespace' into 'master'Phil Hughes2017-06-151-0/+1
* Merge branch 'fix-filename-of-artifact-uploader' into 'master'Grzegorz Bizon2017-06-151-0/+4
* Merge branch 'sh-fix-refactor-uploader-work-dir' into 'master'Kamil Trzciński2017-06-153-12/+23
* Merge branch '29010-perf-bar' into 'master'Robert Speicher2017-06-1510-1/+76
* Merge branch '33469-focus' into 'master'Annabel Dunstone Gray2017-06-152-1/+5
* Merge branch 'port-post-receive-changes' into 'master'Robert Speicher2017-06-151-21/+17
* Merge branch '33466-jobs-navigation-menu' into 'master'Phil Hughes2017-06-151-1/+1
* Merge branch '33467-remove-nicescroll' into 'master'Phil Hughes2017-06-153-48/+59
* Merge branch 'zj-raise-etag-route-regex-miss' into 'master'Kamil Trzciński2017-06-151-1/+2
* Merge branch '33483-fix-note-highlight-being-lost-on-note-update' into 'master'Phil Hughes2017-06-151-3/+25
* Merge branch '33529-fix-autocomplete-atwho-not-showing-on-note-edit-form' int...Clement Ho2017-06-151-1/+1
* Merge branch 'fix-manual-actions' into 'master'Grzegorz Bizon2017-06-151-2/+2
* Merge branch 'fix/gb/remove-invalid-build-details-exposure' into 'master'Kamil Trzciński2017-06-151-5/+2
* Merge branch '33642-timeago-update' into 'master'Phil Hughes2017-06-151-14/+2
* Fix bad merge9-3-stable-rc2Clement Ho2017-06-092-19/+0
* Resolve inconsistenciesClement Ho2017-06-095-209/+3
* Merge commit 'b1bf6d88fceb24663bfe4be2d9cc111710d9126b' into 9-3-stableClement Ho2017-06-0962-229/+1256
|\
| * Merge branch 'master-security-update' into 'master'Regis Boudinot2017-06-085-7/+31
| |\
| | * Merge remote-tracking branch 'origin/upstream-9-2-security' into master-secur...master-security-updateDJ Mountney2017-06-081-1/+3
| | |\
| | | * 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-085-7/+29
| | * | Merge branch 'upstream-9-2-security' into master-security-updateDJ Mountney2017-06-082-4/+21
| | |\ \
| | | * | Bring in security changes from the 9.2.5 releaseDJ Mountney2017-06-075-7/+29
| | * | | Merge branch '25934-project-snippet-vis' into 'security-9-2'DJ Mountney2017-06-081-0/+5
| | * | | Merge branch 'dz-restrict-autocomplete' into 'security-9-1'DJ Mountney2017-06-081-1/+1
| | * | | Merge branch 'cherry-pick-dc2ac993' into 'security-9-2'DJ Mountney2017-06-081-2/+2
| * | | | Merge branch '25426-group-dashboard-ui' into 'master'Douwe Maan2017-06-0821-46/+1034
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into 25426-group-dashboard-ui25426-group-dashboard-uiAlfredo Sumaran2017-06-0892-351/+492
| | |\ \ \ \
| | * | | | | Add tests when user has no direct acces to a groupAlfredo Sumaran2017-06-081-2/+2
| | * | | | | 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-072-0/+5
| | * | | | | 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-07363-1545/+4419
| | |\ \ \ \ \
| | * | | | | | Address feedbackAlfredo Sumaran2017-06-072-3/+1
| | * | | | | | Turn off every event on beforeDestroyAlfredo Sumaran2017-06-071-0/+8
| | * | | | | | Restore code to make explore groups workAlfredo Sumaran2017-06-073-1/+22
| | * | | | | | Address feedbackAlfredo Sumaran2017-06-076-70/+113