summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add CHANGELOG entry41922-simplify-runner-registration-token-resettingTomasz Maczukin2018-10-041-0/+5
|
* Simplify runner registration token resettingTomasz Maczukin2018-10-0448-176/+286
| | | | | | | | | | | | | | | | | | | | | | | | This icommit adds several changes related to the same topic - resetting a Runner registration token: 1. On Project settings page it adds a button for resetting the registration token and it removes the Runner token field that was confusing all GitLab users. 2. On Group settings page it adds the same button for resetting the registration token. 3. On Admin Runners settings page it moves the button to the same place as in Project and Group settings and it changes slightly the page layout to make it more similar to Group and Project setting pages. 4. It refactorizes a little the partial that prints runner registration description. Thanks to this Project, Group and Admin settings of the Runner are re-using the same code to generate the button. 5. Updates the translations of changed text.
* Merge branch '_acet-fix-diff-file-header' into 'master'Mike Greiling2018-10-035-102/+11
|\ | | | | | | | | | | | | Fix showing diff file header for renamed files Closes #48887 See merge request gitlab-org/gitlab-ce!22089
| * Fix showing diff file header for renamed filesFatih Acet2018-10-035-102/+11
| |
* | Merge branch '43511-upgrade-to-babel-7' into 'master'Fatih Acet2018-10-036-883/+851
|\ \ | | | | | | | | | | | | | | | | | | Upgrade to Babel 7 Closes #43511 See merge request gitlab-org/gitlab-ce!22059
| * | Add missing yarn integrity hashesMike Greiling2018-10-031-0/+1162
| | |
| * | Make DefinePlugin definitions more specificMike Greiling2018-10-021-3/+2
| | |
| * | Update babelrc with commentsMike Greiling2018-10-022-35/+38
| | |
| * | Merge branch 'master' into 43511-upgrade-to-babel-7Mike Greiling2018-10-02144-6826/+36308
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (30 commits) Refactor quick actions docs into multiple tables CE Resolve "Refactor code quality similar to JUnit tests" Fix rename_login_root_namespaces post migration Merge branch 'master-i18n' into 'master' Hides Close MR button on merged MR Show the commit-sha for pre-release versions Resolve "Add "Link" shortcut/icon in markdown editor to make it easier to add references" Use tiller locally for Auto Devops Improve logging when username update fails due to registry tags [QA] Improve admin hashed-storage settings circumvent browser cache on browser back navigation Highlight current user in comments and system notes Resolve "Selecting an autofill suggestion for project name will not update the project slug" Update Workhorse to 7.0.0 for Gitaly's new auth scheme Update to Rouge 3.3.0 including frozen string literals for improved memory usage Don't check for the groups list before filtering Add missing changelog type [ci skip] Filter issues without an Assignee via the API Make single diff patch limit configurable Add yarn integrity hashes ...
| * | | Remove babel-plugin-transform-define dependencyMike Greiling2018-10-025-27/+8
| | | |
| * | | Merge remote-tracking branch 'origin/psimyn-speedup-karma' into ↵Mike Greiling2018-10-022-2/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 43511-upgrade-to-babel-7 * origin/psimyn-speedup-karma: Fix lint and comments Speed up karma runs for development
| | * | | Fix lint and commentsSimon Knox2018-10-021-1/+1
| | | | |
| | * | | Speed up karma runs for developmentSimon Knox2018-10-022-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using DefinePlugin means the block wrapped in GENERATE_COVERAGE_REPORT gets eliminated. Previously it was always included (with the entire app!), even if using -f option
| * | | | Add license approval for caniuse-lite and node-releasesMike Greiling2018-10-021-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are needed for babel-preset-env to function. These are both curated lists of compatability tables which are used during the build process to determine which babel transformations to perform.
| * | | | Upgrade to babel 7Mike Greiling2018-10-023-748/+713
| |/ / /
* | | | 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
| | | | | | | | | | | | |
View Lorry Controller Status