summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Disable the Style/PreferredHashMethods copdisable-Style/PreferredHashMethods-copRémy Coutable2017-06-091-1/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'tc-link-to-commit-on-help-page' into 'master'Robert Speicher2017-06-094-3/+9
|\ | | | | | | | | Make the revision on the `/help` page clickable See merge request !12016
| * Make the revision on the `/help` page clickabletc-link-to-commit-on-help-pageToon Claes2017-06-094-3/+9
| | | | | | | | | | For quicker access, add hyperlink to the gitlab.com commits page for the current REVISION of GitLab.
* | Merge branch 'dturner/grammar' into 'master'Rémy Coutable2017-06-091-4/+4
|\ \ | | | | | | | | | | | | Improve the grammar of the API docs See merge request !11863
| * | Improve the grammar of the API docsDavid Turner2017-06-011-4/+4
| | |
* | | Merge branch 'patch-17' into 'master'Rémy Coutable2017-06-091-2/+1
|\ \ \ | | | | | | | | | | | | | | | | Fix syntax error that breaks link to permissions document. See merge request !11968
| * | | Fix syntax error that breaks link to permissions document.Sascha Reynolds2017-06-091-2/+1
|/ / /
* | | Merge branch 'clarify-transferring-project' into 'master'Rémy Coutable2017-06-091-2/+3
|\ \ \ | | | | | | | | | | | | | | | | Clarify transferring project, specify permissions See merge request !11934
| * | | Clarify transferring project, specify permissionsLauri Piisang2017-06-091-2/+3
| | | |
* | | | Merge branch 'patch-17' into 'master'Rémy Coutable2017-06-091-0/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update google.md See merge request !12010
| * | | | Update google.mdKanchana Wickremasinghe2017-06-081-0/+15
| | | | |
* | | | | Merge branch 'fix-triggered-builds' into 'master'Rémy Coutable2017-06-091-2/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix triggered CE builds Closes #33512 See merge request !12046
| * | | | | 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 ↵Marcia Ramos2017-06-091-0/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add note on moving or renaming registry repository See merge request !11882
| * | | | | | Add note on moving or renaming registry repositoryadd-note-renaming-moving-registry-container-user-docsCindy Pallares 🦉2017-06-061-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | As per d5d8e76bd79cd9d61c66539a5069104cf46be2bd, any attempts to rename a container registry repository are blocked due to image signatures.
* | | | | | | Merge branch '33315-es6-findindex-support' into 'master'Tim Zallmann2017-06-091-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Array `findIndex` support Closes #33315 See merge request !11961
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prompt user to create personal access token for Git over HTTP See merge request !11986
| * | | | | | | | Instruct user to use a personal access token for Git over HTTPRobin Bobbitt2017-06-077-10/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If internal auth is disabled and LDAP is not configured on the instance, present the user with a message to create a personal access token if his Git over HTTP auth attempt fails.
* | | | | | | | | Merge branch 'locales_fix' into 'master'Rémy Coutable2017-06-092-0/+39
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Locales fix See merge request !12018
| * | | | | | | | | 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 trace Closes #33467 and #33427 See merge request !12028
| * | | | | | | | | | 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 loading Closes #33477 See merge request !12023
| * | | | | | | | | | Fixed dashboard milestone tabs not loadingdashboard-milestone-tabs-loading-asyncPhil Hughes2017-06-098-8/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #33477
* | | | | | | | | | | 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 widget Closes #33381 See merge request !12021
| * | | | | | | | | | | 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 time Closes #33081 See merge request !12034
| * | | | | | | | | | 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 blob binaryness changes after loading all data See merge request !11981
| * | | | | | | | | | | Detect if file that appears to be text in the first 1024 bytes is actually ↵dm-blob-binaryness-changeDouwe Maan2017-06-087-18/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | binary afer loading all data
* | | | | | | | | | | | Merge branch 'issuable-sidebar-edit-button-field-focus' into 'master'Filipa Lacerda2017-06-093-4/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed dropdown filter input not focusing after transition Closes #33216 See merge request !12020
| * | | | | | | | | | | Fixed dropdown filter input not focusing after transitionissuable-sidebar-edit-button-field-focusPhil Hughes2017-06-083-4/+22
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #33216
* | | | | | | | | | | Merge branch '33466-jobs-navigation-menu' into 'master'Phil Hughes2017-06-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Highlight jobs menu when we are in jobs page Closes #33466 See merge request !12029
| * | | | | | | | | | | 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 conflicts See merge request !11916
| * | | | | | | | | | 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 spec See merge request !12024
| * | | | | | | | | | 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 GraphQL See merge request !12030
| * | | | | | | | | | | Clarify API V5 being a compatability layer on top of GraphQLStan Hu2017-06-081-3/+7
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | Merge branch 'master-security-update' into 'master'Regis Boudinot2017-06-0855-66/+1256
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Master security update See merge request !12025
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/upstream-9-2-security' into ↵master-security-updateDJ Mountney2017-06-082-6/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-security-update
| | * | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ran: - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch - git checkout -b 9-2-5-security-patch origin/v9.2.2 - git apply patchfile.patch - git commit - [Got the sha ref for the commit] - git checkout -b upstream-9-2-security master - git cherry-pick <SHA of the patchfile commit> - [Resolved conflicts] - git cherry-pick --continue
| * | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ran: - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch - git checkout -b 9-2-5-security-patch origin/v9.2.2 - git apply patchfile.patch - git commit - [Got the sha ref for the commit] - git checkout -b upstream-9-2-security master - git cherry-pick <SHA of the patchfile commit> - [Resolved conflicts] - git cherry-pick --continue
| * | | | | | | | | | | | | Merge branch '25934-project-snippet-vis' into 'security-9-2'DJ Mountney2017-06-0813-18/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix visibility when referencing snippets See merge request !2101
| * | | | | | | | | | | | | Merge branch 'dz-api-x-frame' into 'security-9-2'DJ Mountney2017-06-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restrict API X-Frame-Options to same origin See merge request !2103