summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into 'prettify-all-the-things-4'prettify-all-the-things-4Mike Greiling2018-10-261671-15638/+158455
|\ | | | | | | # Conflicts: # app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue
| * Merge branch 'an-multithreading' into 'master'Robert Speicher2018-10-2523-75/+966
| |\ | | | | | | | | | | | | | | | | | | Puma in GDK and rack server lifecycle event abstractions Closes #52762 See merge request gitlab-org/gitlab-ce!22372
| | * Add experimental support for Pumaan-multithreadingAndrew Newdigate2018-10-2523-75/+966
| | | | | | | | | | | | | | | | | | This allows us (and others) to test drive Puma without it affecting all users. Puma can be enabled by setting the environment variable "EXPERIMENTAL_PUMA" to a non empty value.
| * | Merge branch 'ml-qa-repo-logging' into 'master'Robert Speicher2018-10-254-7/+17
| |\ \ | | | | | | | | | | | | | | | | Re-enable debug logging of Git commands and output See merge request gitlab-org/gitlab-ce!22608
| | * | Re-enable debug logging of Git commands and outputml-qa-repo-loggingMark Lapierre2018-10-254-7/+17
| | | |
| * | | Merge branch '40372-prometheus-dashboard-broken-on-firefox' into 'master'Clement Ho2018-10-252-2/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Prometheus dashboard broken on Firefox" Closes #40372 See merge request gitlab-org/gitlab-ce!22400
| | * | | Fix prometheus graphs in firefox40372-prometheus-dashboard-broken-on-firefoxAdriel Santiago2018-10-242-2/+8
| | | | |
| * | | | Merge branch '52993-ldap-rename_provider-rake-task-broken' into 'master'Nick Thomas2018-10-252-1/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "LDAP rename_provider rake task broken" Closes #52993 See merge request gitlab-org/gitlab-ce!22582
| | * | | | Use gitlab_environment for ldap rake task52993-ldap-rename_provider-rake-task-brokenCindy Pallares2018-10-252-1/+6
| | | | | |
| * | | | | Merge branch 'winh-countdown-component' into 'master'Clement Ho2018-10-254-0/+156
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add reusable component for counting down See merge request gitlab-org/gitlab-ce!22499
| | * | | | | Add validation for date strings passed to GlCountdownwinh-countdown-componentWinnie Hellmann2018-10-252-6/+23
| | | | | | |
| | * | | | | Add reusable component for counting downWinnie Hellmann2018-10-252-0/+109
| | | | | | |
| | * | | | | Add calculateRemainingMilliseconds() helper functionWinnie Hellmann2018-10-252-0/+30
| | | | | | |
| | * | | | | Move datetime_utility_spec.js to correct locationWinnie Hellmann2018-10-251-0/+0
| | | | | | |
| * | | | | | Merge branch '51826-single-product-defintion-qa' into 'master'Douglas Barbosa Alexandre2018-10-2534-620/+540
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always use `attribute` to define the product Closes gitlab-qa#235 and #51826 See merge request gitlab-org/gitlab-ce!22327
| | * | | | | | Always use `attribute` to define the productLin Jen-Shin2018-10-2534-620/+540
| |/ / / / / /
| * | | | | | Merge branch 'jramsay-42673-commit-tooltip' into 'master'Douwe Maan2018-10-252-1/+6
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add title to commit links in list view Closes #42673 See merge request gitlab-org/gitlab-ce!22585
| | * | | | | Add title to commit links in list viewJames Ramsay2018-10-252-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The short commit message may be truncated making the truncated portion unreadable. The title of the link should be the commit message so that the commit message is shown when hovering the commit message anchor. Closes gitlab-org/gitlab-ce#42673
| * | | | | | Merge branch 'prettify-all-the-things-3' into 'master'Tim Zallmann2018-10-2546-780/+1001
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prettify all the things (part 3) See merge request gitlab-org/gitlab-ce!22251
| | * | | | | | Prettify app/assets/javascripts/pagesprettify-all-the-things-3Mike Greiling2018-10-1746-780/+1001
| | | | | | | |
| * | | | | | | Merge branch '49565-ssh-push-mirroring' into 'master'Robert Speicher2018-10-255-0/+374
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Backport SSH host key detection code to CE See merge request gitlab-org/gitlab-ce!22577
| | * | | | | | Backport SSH host key detection code to CENick Thomas2018-10-255-0/+374
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This functionality is needed for SSH push mirroring support, which is a CE feature.
| * | | | | | | Merge branch 'sh-update-parser' into 'master'Robert Speicher2018-10-252-2/+2
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Upgrade parser gem to 2.5.1.2 See merge request gitlab-org/gitlab-ce!22590
| | * | | | | | Upgrade parser gem to 2.5.1.2sh-update-parserStan Hu2018-10-242-2/+2
| | | | | | | |
| * | | | | | | Merge branch 'mj/review-apps-guard' into 'master'Robert Speicher2018-10-251-1/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Review apps cleanup schedule runs on master See merge request gitlab-org/gitlab-ce!22601
| | * | | | | | | Review apps cleanup schedule runs on masterMarin Jankovski2018-10-251-1/+0
| |/ / / / / / /
| * | | | | | | Merge branch '53055-combine-date-util-functions' into 'master'Filipa Lacerda2018-10-2513-380/+379
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Combine all datetime library functions into `datetime_utility.js` This MR moves datetime methods from `app/assets/javascripts/lib/utils/pretty_time.js` & `app/assets/javascripts/lib/utils/datefix.js` into `app/assets/javascripts/lib/utils/datetime_utility.js`. Closes #53055 See merge request gitlab-org/gitlab-ce!22570
| | * | | | | | | Add changelog entry53055-combine-date-util-functionsKushal Pandya2018-10-251-0/+5
| | | | | | | | |
| | * | | | | | | Run through Prettier and remove ESLint disablesKushal Pandya2018-10-254-151/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Formats the file to match Prettier rules Removes all blacklisted ESLint rules
| | * | | | | | | Update pretty_time methods import pathKushal Pandya2018-10-252-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates path for pretty time related methods to import from `datetime_utility.js`
| | * | | | | | | Add pretty_time methodsKushal Pandya2018-10-254-198/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds methods from `app/assets/javascripts/lib/utils/pretty_time.js` and deletes the file
| | * | | | | | | Update pikaday method import pathKushal Pandya2018-10-254-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates path for pikaday parsing methods to import from `datetime_utility.js`
| | * | | | | | | Add pikaday parsing methodsKushal Pandya2018-10-254-55/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds methods from `app/assets/javascripts/lib/utils/datefix.js` and deletes the files
| | * | | | | | | Convert methods to ES6 exportsKushal Pandya2018-10-251-39/+36
| | |/ / / / / /
| * | | | | | | Merge branch 'mr-diff-data' into 'master'Filipa Lacerda2018-10-258-126/+109
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Impove diff discussion data See merge request gitlab-org/gitlab-ce!22491
| | * | | | | | | Fixed action & mutation specsPhil Hughes2018-10-252-44/+29
| | | | | | | | |
| | * | | | | | | Update the state, not a paramPhil Hughes2018-10-253-56/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed a bug where discussions wouldn't be assigned to a line when switching from discussion tab to changes tab
| | * | | | | | | Impove diff discussion datamr-diff-dataPhil Hughes2018-10-248-83/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pre-request to https://gitlab.com/gitlab-org/gitlab-ce/issues/48956
| * | | | | | | | Merge branch 'refactor_gitlab_kube_client' into 'master'Kamil Trzciński2018-10-257-150/+47
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Gitlab::KubeClient Closes #52131 See merge request gitlab-org/gitlab-ce!22073
| | * | | | | | | | Store version within SUPPORTED_API_GROUPS hashrefactor_gitlab_kube_clientThong Kuah2018-10-235-74/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the ability to pass in a different version. We can instead create a new entry in the SUPPORTED_API_GROUPS hash for a different version if need be.
| | * | | | | | | | DRY up *_clients methodsThong Kuah2018-10-231-25/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build using `define_method` directly from the constant, saves us writing api_groups strings twice.
| | * | | | | | | | Split hashed_clients into one per api_groupThong Kuah2018-10-231-11/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Essentially make #build_kubeclient do less. Should be much clearer now
| | * | | | | | | | Update all usages of KubeClientThong Kuah2018-10-235-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Find and replace everywhere we pass in `api_groups` to KubeClient, as no longer needed
| | * | | | | | | | Remove api_groups from KubeClient constructorThong Kuah2018-10-232-117/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should have access to #core_client, #rbac_client, and #extensions_client without having to pass in an awkward array. Also change api_version to default_api_version, which allows us to use a different version for an individual client. Special case for apis/extensions which only go up to v1beta1 Makes #hashed_client private Removes the #clients and #discover! methods which are un-used
| * | | | | | | | | Merge branch '52202-consider-moving-isjobstuck-verification-to-backend' into ↵Kamil Trzciński2018-10-2510-88/+192
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Move job stuck status to backend Closes #52202 See merge request gitlab-org/gitlab-ce!22442
| | * | | | | | | | | Move job stuck status to backendSteve Azzopardi2018-10-2510-88/+192
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'jlenny-UpdateAndroidTemplate' into 'master'Grzegorz Bizon2018-10-251-34/+28
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Android.gitlab-ci.yml template to current Android SDK version See merge request gitlab-org/gitlab-ce!22531
| | * | | | | | | | Update link to blog post since it didn't go out on 23rdjlenny-UpdateAndroidTemplateJason Lenny2018-10-241-1/+1
| | | | | | | | | |
| | * | | | | | | | Update Android.gitlab-ci.yml with result of new blog post: ↵Jason Lenny2018-10-231-34/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/15746
| * | | | | | | | | Merge branch 'sh-bump-ruby-2.4.5' into 'master'Robert Speicher2018-10-245-10/+21
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade to Ruby 2.4.5 See merge request gitlab-org/gitlab-ce!22484
View Lorry Controller Status