summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fixed bug when clicking file link causing user to navigate awayPhil Hughes2017-10-1711-33/+45
* fixed prev directory row not correctly having colspanPhil Hughes2017-10-163-9/+9
* made serializing genericPhil Hughes2017-10-164-26/+26
* fixed rendering bugsPhil Hughes2017-10-165-18/+6
* Spec updatesPhil Hughes2017-10-163-26/+25
* Refactored multi-file data structurePhil Hughes2017-10-1616-450/+301
* Popen with a timeoutAndrew Newdigate2017-10-161-1/+1
* Merge branch 'backport-milestone-select-change' into 'master'Filipa Lacerda2017-10-161-0/+2
|\
| * Backport a change in milestone_select from EEbackport-milestone-select-changePhil Hughes2017-10-131-0/+2
* | Merge branch 'fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cl...Kamil Trzciński2017-10-161-0/+3
|\ \
| * | Collect usage pings `Gcp::Cluster.enabled` and `Gcp::Cluster.disabled`, inste...fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cluster-disabled-instead-of-gcp-cluster-countShinya Maeda2017-10-111-0/+3
* | | Move retry button to sidebarFilipa Lacerda2017-10-163-13/+5
* | | Merge branch '39111-remove-n-shortcut' into 'master'Filipa Lacerda2017-10-131-4/+0
|\ \ \ | |_|/ |/| |
| * | Remove global dropdown shortcut from help modal39111-remove-n-shortcutAnnabel Dunstone Gray2017-10-131-4/+0
* | | Merge branch 'ph-shortcut-js-modules' into 'master'Filipa Lacerda2017-10-1310-313/+236
|\ \ \ | |/ / |/| |
| * | spec fixesph-shortcut-js-modulesPhil Hughes2017-10-131-1/+1
| * | Remove shortcut JS classes from global namespacePhil Hughes2017-10-1310-313/+236
* | | Merge branch 'gitlab-ee-1312-time-spent-at' into 'master'Sean McGivern2017-10-133-8/+19
|\ \ \
| * | | added date parameter for time trackinggitlab-ee-1312-time-spent-atVlad2017-10-133-8/+19
| |/ /
* | | Merge branch 'server-flash-click-remove' into 'master'Filipa Lacerda2017-10-132-2/+13
|\ \ \
| * | | Fixed server rendered flash not being removed on clickserver-flash-click-removePhil Hughes2017-10-132-2/+13
* | | | Merge branch 'backport-ee-2869' into 'master'Sean McGivern2017-10-131-1/+1
|\ \ \ \
| * | | | backport for gitlab-ee!2869backport-ee-2869Simon Knox2017-10-131-1/+1
* | | | | Merge branch '39032-improve-merge-ongoing-check-consistency' into 'master'Sean McGivern2017-10-131-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Simplify check for running job on Redis39032-improve-merge-ongoing-check-consistencyOswaldo Ferreira2017-10-131-1/+1
| * | | | Make "merge ongoing" check more consistentOswaldo Ferreira2017-10-111-1/+1
* | | | | Refactor broadcast_message.jsMike Greiling2017-10-133-26/+24
* | | | | Merge branch '38869-members' into 'master'Phil Hughes2017-10-134-120/+110
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove members and memberExpirationDate from window object38869-membersFilipa Lacerda2017-10-124-120/+110
* | | | | Merge branch 'revert-8ae7963c' into 'master'Rémy Coutable2017-10-131-1/+0
|\ \ \ \ \
| * | | | | Revert "Merge branch '36160-select2-dropdown' into 'master'"revert-8ae7963cFilipa Lacerda2017-10-121-1/+0
* | | | | | Merge branch 'fix-cursor-path' into 'master'Tim Zallmann2017-10-131-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Use image-url instead of url so that asset pipeline can do it's thingfix-cursor-pathClement Ho2017-10-101-2/+2
* | | | | | Add create merge checkbox.Jacob Schatz2017-10-128-11/+138
* | | | | | Merge branch '26763-grant-registry-auth-scope-to-admins' into 'master'Kamil Trzciński2017-10-121-3/+14
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | refactor access handlingVratislav Kalenda2017-10-101-5/+12
| * | | | | remove whitespaceVratislav Kalenda2017-10-081-1/+0
| * | | | | Issue JWT token with registry:catalog:* scope when requested by GitLab adminVratislav Kalenda2017-10-081-0/+5
* | | | | | Merge branch '34897-delete-branch-after-merge' into 'master'Sean McGivern2017-10-121-7/+11
|\ \ \ \ \ \
| * | | | | | fix a whitespace34897-delete-branch-after-mergeMicael Bergeron2017-10-121-1/+1
| * | | | | | fix for discussionMicael Bergeron2017-10-121-3/+4
| * | | | | | fix the merger override to remove source branchmicael.bergeron2017-10-111-5/+8
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '37691-subscription-fires-multiple-notifications' into 'master'Sean McGivern2017-10-121-1/+1
|\ \ \ \ \ \
| * | | | | | fix multiple notifications from being sent for multiple labelsmicael.bergeron2017-10-101-1/+1
* | | | | | | Merge branch 'cache-issuable-template-names' into 'master'Douwe Maan2017-10-123-13/+20
|\ \ \ \ \ \ \
| * | | | | | | Cache issuable template namesSean McGivern2017-10-122-12/+17
| * | | | | | | Match full file path in FileDetectorSean McGivern2017-10-121-1/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'dm-api-authentication' into 'master'Robert Speicher2017-10-121-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Move all API authentication code to APIGuardDouwe Maan2017-10-121-0/+2
* | | | | | | | Fixes from CSS refactorAnnabel Dunstone Gray2017-10-121-0/+2
View Lorry Controller Status