summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Make perfbar z-index above modal background50552-unable-to-close-performance-barSimon Knox2018-10-043-1/+8
|
* Merge branch 'update-dev-test-gems' into 'master'Robert Speicher2018-10-032-21/+21
|\ | | | | | | | | Update Development related gems See merge request gitlab-org/gitlab-ce!22066
| * Update Development related gemsGabriel Mazetto2018-10-032-21/+21
| | | | | | | | | | | | | | | | | | Upgrade to latest version the following gems: * Spring * Bootsnap * Thin * webpack-rails * pry-rails
* | Merge branch 'jivl-glui-button' into 'master'Clement Ho2018-10-035-15/+21
|\ \ | | | | | | | | | | | | Add gl-button from gitlab-ui See merge request gitlab-org/gitlab-ce!21941
| * | Update GitLab-ui version in package.jsonjivl-glui-buttonJose Vargas2018-10-022-4/+5
| | |
| * | Add gl-button from gitlab-uiJose Vargas2018-10-025-14/+19
| | |
* | | Merge branch ↵Tim Zallmann2018-10-036-24/+29
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'ce-7424-create-a-generic-event-listener-for-tracking-clicks-on-gitlab-com' into 'master' CE port Resolve "Create a generic event listener for tracking clicks on GitLab.com" See merge request gitlab-org/gitlab-ce!22002
| * | | CE port Resolve "Create a generic event listener for tracking clicks on ↵Martin Wortschack2018-10-036-24/+29
|/ / / | | | | | | | | | GitLab.com"
* | | Merge branch 'update-codeowners-scss' into 'master'Tim Zallmann2018-10-031-1/+2
|\ \ \ | | | | | | | | | | | | | | | | Update CODEOWNERS for FE and .scss See merge request gitlab-org/gitlab-ce!21913
| * | | Update CODEOWNERSAnnabel Dunstone Gray2018-10-031-1/+2
| | | |
* | | | Merge branch 'qa-257-group-saml-sso' into 'master'Rémy Coutable2018-10-031-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add element classes used in ee branch qa-257-group-saml-sso See merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22074
| * | | | Add element classes used in ee branch qa-257-group-saml-ssosliaquat2018-10-031-3/+3
| | | | |
* | | | | Merge branch 'ml-qa-retry-fork-project-fix' into 'master'Rémy Coutable2018-10-031-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | QA: Revisit the login page when attempt to retry login See merge request gitlab-org/gitlab-ce!22061
| * | | | | Revisit the login page when attempt to retry loginMark Lapierre2018-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When registration fails to successfully sign in, it looks like the UI has a sign-out option, but it doesn't. So instead of trying to use the UI, revisit the login page directly.
* | | | | | Merge branch '50904-vuex-show-block' into 'master'Phil Hughes2018-10-0316-468/+687
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses Vue app to render part of job show page See merge request gitlab-org/gitlab-ce!22028
| * | | | | | Uses Vue app to render part of job show pageFilipa Lacerda2018-10-0316-468/+687
|/ / / / / /
* | | | | | Merge branch 'tc-geo-log-object-storage-ce' into 'master'Douglas Barbosa Alexandre2018-10-035-0/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of "Use Geo log to remove files when migrated to object storage" See merge request gitlab-org/gitlab-ce!22049
| * | | | | | Backport of "Use Geo log to remove files when migrated to object storage"Toon Claes2018-10-035-0/+24
|/ / / / / /
* | | | | | Merge branch '_acet-fix-placeholder-note' into 'master'Phil Hughes2018-10-033-1/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix placeholder note rendering. Closes #48933 See merge request gitlab-org/gitlab-ce!22078
| * | | | | | Fix placeholder note renderingFatih Acet2018-10-033-1/+32
| | | | | | |
* | | | | | | Merge branch '50904-stages-sidebar' into 'master'Phil Hughes2018-10-0321-674/+1727
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves stages dropdown into the new vue app See merge request gitlab-org/gitlab-ce!21971
| * | | | | | | Moves stages dropdown into the new vue appFilipa Lacerda2018-10-0321-674/+1727
|/ / / / / / /
* | | | | | | Merge branch 'gt-update-git-lfs-fetch-command' into 'master'Achilleas Pipinellis2018-10-031-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update `git lfs fetch` command See merge request gitlab-org/gitlab-ce!22077
| * | | | | | | Update `git lfs fetch` command [ci skip]George Tsiolis2018-10-031-2/+2
| | | | | | | |
* | | | | | | | Merge branch '45016-add-web-ide-commits-to-usage-ping' into 'master'Douwe Maan2018-10-037-0/+58
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds Web IDE commits to usage ping Closes #45016 See merge request gitlab-org/gitlab-ce!22007
| * | | | | | | | Implements Web IDE commits counter in RedisTiago Botelho2018-10-0312-133/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes a temporary implementation of the Web IDE commits counter using Redis while https://gitlab.com/gitlab-org/gitlab-ce/issues/52096 is being discussed further for a more generic approach to counters
| * | | | | | | | Adds WebIDE commits to UsagePingTiago Botelho2018-10-0112-1/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements UsageCounters model to track feature usage counters and makes easy to extend for future counters
* | | | | | | | | Update CHANGELOG.md for 11.3.2GitLab Release Tools Bot2018-10-036-25/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge branch '48004-db-initialize-migrate' into 'master'Dmitriy Zaporozhets2018-10-033-20/+85
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support db migration and initialization for Auto DevOps Closes #48004 See merge request gitlab-org/gitlab-ce!21955
| * | | | | | | | | Be explicit about PostgreSQL in auto devops docsDylan Griffith2018-10-031-2/+2
| | | | | | | | | |
| * | | | | | | | | Doc improvements for DB migrations in Auto DevOpsDylan Griffith2018-10-031-5/+5
| | | | | | | | | |
| * | | | | | | | | Minor doc update for auto devops db migrations48004-db-initialize-migrateDylan Griffith2018-10-021-1/+3
| | | | | | | | | |
| * | | | | | | | | Document how to use DB_INITIALIZE and DB_MIGRATEThong Kuah2018-10-021-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Limitation of DB_INITIALIZE (run once) * helm hooks * Examples
| * | | | | | | | | Process $DB_INITIALIZE and $DB_MIGRATE variablesThong Kuah2018-09-272-20/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if $DB_INITIALIZE is present, deploy an initial release where only $DB_INITIALIZE is run in a special job (and deployments are not rendered/loaded). This is then followed by second release with deployments as usual. if $DB_MIGRATE, set this value which will trigger a pre-upgrade helm hook.
* | | | | | | | | | Merge branch '52066-blacklist-encrypted_-columns-in-gitlab-project-export' ↵Nick Thomas2018-10-031-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Blacklist `encrypted_*` columns in gitlab project export" Closes #52066 See merge request gitlab-org/gitlab-ce!22072
| * | | | | | | | | | Add encrypted sensitive word to export specJames Lopez2018-10-031-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'mr-file-tree-data' into 'master'Filipa Lacerda2018-10-0344-556/+1038
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Request file tree Closes #14249 See merge request gitlab-org/gitlab-ce!21833
| * | | | | | | | | | | Added file tree to merge request diffsPhil Hughes2018-10-0344-556/+1038
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This file tree displays all the diff files in a tree like format Each file is taken and converted into a tree with folders Each folder can be toggled open & closed Clicking a file will scroll to the diff file & highlight with a glow affect Searching the tree list will search only files & return a list of the files without any folders Each file row contains an icon to show changed, new file or deleted Each row will also contain the added & removed lines count Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14249
* | | | | | | | | | | | Merge branch 'remove-rugged' into 'master'Douwe Maan2018-10-0345-560/+220
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Gitlab::Git::Repository#rugged See merge request gitlab-org/gitlab-ce!22039
| * | | | | | | | | | | | Remove Gitlab::Git::Repository#rugged and Gollum codeAlejandro Rodríguez2018-10-0246-563/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup code, and refactor tests that still use Rugged. After this, there should be no Rugged code that access the instance's repositories on non-test environments. There is still some rugged code for other tasks like the repository import task, but since it doesn't access any repository storage path it can stay.
* | | | | | | | | | | | | Merge branch 'docs-jira-update' into 'master'Marcia Ramos2018-10-031-117/+119
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port Jira integration documentation update to CE Closes #50505 See merge request gitlab-org/gitlab-ce!22062
| * | | | | | | | | | | | | Port jira doc update to ceMike Lewis2018-10-021-117/+119
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '#51699-time-tracker-naming' into 'master'Phil Hughes2018-10-034-53/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix props name casing in time time tracker vue component Closes #45977 and #51699 See merge request gitlab-org/gitlab-ce!21889
| * | | | | | | | | | | | | | Fix props name casing in time time tracker vue componentJohann Hubert Sonntagbauer2018-10-034-53/+44
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'add-clipboard-button-to-application-id-and-secret' into 'master'Phil Hughes2018-10-037-22/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add copy to clipboard button for application id and secret See merge request gitlab-org/gitlab-ce!21978
| * | | | | | | | | | | | | | Add copy to clipboard button for application id and secretGeorge Tsiolis2018-10-037-22/+45
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'ccr/wip_filter' into 'master'Tim Zallmann2018-10-0322-56/+300
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #13650 added wip search functionality and tests See merge request gitlab-org/gitlab-ce!18119
| * | | | | | | | | | | | | #13650 added wip search functionality and testsChantal Rollison2018-10-0322-56/+300
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'ce-7014-epic-status-tabs' into 'master'Grzegorz Bizon2018-10-031-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract status count key to a method See merge request gitlab-org/gitlab-ce!22021
| * | | | | | | | | | | | Extract status count key to a methodJarka Košanová2018-10-011-1/+5
| | | | | | | | | | | | |