summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Don't use Pygment,rb, use Rouge instead, and put peek-pg in the :postgres groupRémy Coutable2017-06-095-6/+100
* Tweak Peek to display SQL queriesRémy Coutable2017-06-094-30/+52
* Store Sherlock::Query in Peek adapterRémy Coutable2017-06-093-0/+104
* New performance bar that can be enabled with the `p b` shortcutRémy Coutable2017-06-0918-1/+791
* Merge branch 'fix-triggered-builds' into 'master'Rémy Coutable2017-06-091-2/+7
|\
| * Pass false to trigger if EE_PACKAGE not setfix-triggered-buildsBalasankar C2017-06-091-2/+7
* | Merge branch 'add-note-renaming-moving-registry-container-user-docs' into 'ma...Marcia Ramos2017-06-091-0/+8
|\ \
| * | Add note on moving or renaming registry repositoryadd-note-renaming-moving-registry-container-user-docsCindy Pallares 🦉2017-06-061-0/+8
* | | Merge branch '33315-es6-findindex-support' into 'master'Tim Zallmann2017-06-091-0/+1
|\ \ \
| * | | Add Array `findIndex` support33315-es6-findindex-supportkushalpandya2017-06-071-0/+1
* | | | Merge branch 'pat-msg-on-auth-failure' into 'master'Rémy Coutable2017-06-097-10/+74
|\ \ \ \
| * | | | Instruct user to use a personal access token for Git over HTTPRobin Bobbitt2017-06-077-10/+74
* | | | | Merge branch 'locales_fix' into 'master'Rémy Coutable2017-06-092-0/+39
|\ \ \ \ \
| * | | | | Add german translation for time_ago_in_wordsHannes Rosenögger2017-06-082-0/+39
* | | | | | Merge branch '33467-remove-nicescroll' into 'master'Phil Hughes2017-06-093-48/+59
|\ \ \ \ \ \
| * | | | | | Remove nicescroll from job traceFilipa Lacerda2017-06-093-48/+59
|/ / / / / /
* | | | | | Merge branch 'dashboard-milestone-tabs-loading-async' into 'master'Sean McGivern2017-06-098-8/+110
|\ \ \ \ \ \
| * | | | | | Fixed dashboard milestone tabs not loadingdashboard-milestone-tabs-loading-asyncPhil Hughes2017-06-098-8/+110
* | | | | | | Merge branch '33381-display-issue-state-in-mr-widget-issue-links' into 'master'Sean McGivern2017-06-093-2/+28
|\ \ \ \ \ \ \
| * | | | | | | Display issue state in issue links section of merge request widget33381-display-issue-state-in-mr-widget-issue-linksAdam Niedzielski2017-06-093-2/+28
* | | | | | | | Merge branch 'rs-bootsnap' into 'master'Rémy Coutable2017-06-093-0/+17
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Add Bootsnap to all environments to reduce application startup timers-bootsnapRobert Speicher2017-06-083-0/+17
* | | | | | | | Merge branch 'dm-blob-binaryness-change' into 'master'Sean McGivern2017-06-097-18/+64
|\ \ \ \ \ \ \ \
| * | | | | | | | Detect if file that appears to be text in the first 1024 bytes is actually bi...dm-blob-binaryness-changeDouwe Maan2017-06-087-18/+64
* | | | | | | | | Merge branch 'issuable-sidebar-edit-button-field-focus' into 'master'Filipa Lacerda2017-06-093-4/+22
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Fixed dropdown filter input not focusing after transitionissuable-sidebar-edit-button-field-focusPhil Hughes2017-06-083-4/+22
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch '33466-jobs-navigation-menu' into 'master'Phil Hughes2017-06-091-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Highlight jobs menu when we are in jobs pageFilipa Lacerda2017-06-091-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'port-post-receive-changes' into 'master'Robert Speicher2017-06-082-37/+30
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Refactor PostReceive worker to limit merge conflictsport-post-receive-changesDouglas Barbosa Alexandre2017-06-052-37/+30
* | | | | | | | Merge branch 'use-request-store-on-mr-controller-query-count-spec' into 'master'Douwe Maan2017-06-081-1/+6
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Use RequestStore on MR show.json query count specuse-request-store-on-mr-controller-query-count-specOswaldo Ferreira2017-06-081-1/+6
* | | | | | | | Merge branch 'sh-clarify-graphql' into 'master'Douwe Maan2017-06-081-3/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Clarify API V5 being a compatability layer on top of GraphQLStan Hu2017-06-081-3/+7
|/ / / / / / / /
* | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \