summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Improve pipeline CSS54331-pipeline-graph-css-updatemfluharty2019-09-162-6/+7
| | | | | Use utility class for unstyled list Remove direct child requirement for highlighting expanded job
* Port back CSS changes made for EEmfluharty2019-09-161-13/+15
|
* Remove stage column mixinmfluharty2019-09-162-17/+2
|
* Remove stage connector class altogethermfluharty2019-09-163-20/+1
|
* Add changelog entrymfluharty2019-09-161-0/+5
|
* Add flat column connectorsmfluharty2019-09-161-0/+7
|
* Refine CI action icon styles and hover stylesmfluharty2019-09-163-23/+21
|
* Rip out old pipeline graph stylesmfluharty2019-09-165-198/+52
| | | | Start drifting toward the new design spec
* Merge branch 'patch-74' into 'master'Marcia Ramos2019-09-121-3/+4
|\ | | | | | | | | Add warning about LE wildcard certificate for pages See merge request gitlab-org/gitlab-ce!32643
| * Apply suggestion to ↵Vladimir Shushlin2019-09-121-3/+4
|/ | | | doc/user/project/pages/custom_domains_ssl_tls_certification/lets_encrypt_integration.md
* Merge branch 'use-background-migration-for-self-monitoring-project' into ↵Andreas Brandl2019-09-124-214/+251
|\ | | | | | | | | | | | | 'master' Create self-monitoring project in background migration See merge request gitlab-org/gitlab-ce!32819
| * Create self-monitoring project in background migrationReuben Pereira2019-09-124-214/+251
|/ | | | | - A regular migration caused problems such as https://gitlab.com/charts/gitlab/issues/1565.
* Merge branch '61841-fix-encoding-error-in-mr-diffs' into 'master'Nick Thomas2019-09-123-14/+52
|\ | | | | | | | | | | | | Fix encoding error in MR diffs Closes #61841 See merge request gitlab-org/gitlab-ce!32862
| * Fix encoding error in MR diffsHiroyuki Sato2019-09-103-14/+52
| |
* | Merge branch 'pl-rubocop-const-nil' into 'master'Stan Hu2019-09-121-2/+2
|\ \ | | | | | | | | | | | | Fix code docs for RuboCop's helper methods See merge request gitlab-org/gitlab-ce!32937
| * | Fix code docs for RuboCop's helper methodsPeter Leitzen2019-09-121-2/+2
|/ / | | | | | | `(const nil :Foo)` vs `(const nil? :Foo)`
* | Merge branch 'sh-add-index-members-expires' into 'master'Andreas Brandl2019-09-123-1/+24
|\ \ | | | | | | | | | | | | | | | | | | Fix member expiration not always working Closes #67286 See merge request gitlab-org/gitlab-ce!32951
| * | Fix member expiration not always workingsh-add-index-members-expiresStan Hu2019-09-113-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | The Sidekiq job `RemoveExpiredMembersWorker` was failing to run in production because it was hitting statement timeouts because it was scanning all rows in order. On staging, where it used to scan 4 million rows, adding an index brought this down to only a few hundred rows. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/67286
* | | Merge branch 'track-usage-data-for-analytics-features' into 'master'12-3-auto-deploy-20190916Peter Leitzen2019-09-124-0/+20
|\ \ \ | | | | | | | | | | | | | | | | Setup counter for Productivity Analytics See merge request gitlab-org/gitlab-ce!32915
| * | | Setup counter for Productivity AnalyticsAdam Hegyi2019-09-124-0/+20
|/ / / | | | | | | | | | This change sets up a usage counter for productivity analytics feature.
* | | Merge branch 'mishunov-master-patch-90654' into 'master'Filipa Lacerda2019-09-123-3/+7
|\ \ \ | | | | | | | | | | | | | | | | Removed padding from project filter field See merge request gitlab-org/gitlab-ce!32706
| * | | Removed padding from project filter fieldDenys Mishunov2019-09-123-3/+7
|/ / / | | | | | | | | | Resolves a regression caused by https://bit.ly/2k1GozA
* | | Merge branch 'fix-merge-request-spec' into 'master'Filipa Lacerda2019-09-121-3/+5
|\ \ \ | | | | | | | | | | | | | | | | Fix merge_request_spec test See merge request gitlab-org/gitlab-ce!32867
| * | | Fix missing setTimeout in specfix-merge-request-specIllya Klymov2019-09-101-3/+5
| | | |
* | | | Merge branch ↵Rémy Coutable2019-09-123-2/+49
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '50847-automatically-created-mr-uses-wrong-source-branch-when-branching-from-tag' into 'master' Resolve "Automatically created MR uses wrong source branch (when branching from Tag)" Closes #50847 See merge request gitlab-org/gitlab-ce!32392
| * | | | Fix create MR from issue using a tag as ref🙈 jacopo beschi 🙉2019-09-123-2/+49
|/ / / / | | | | | | | | | | | | | | | | Creating a MR from an issue using a tag as ref correctly creates the source branch starting from the tag.
* | | | Merge branch 'jheimbuck_gl-master-patch-11921' into 'master'Evan Read2019-09-121-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Typo fix 'Sempahore' to 'Semaphore' See merge request gitlab-org/gitlab-ce!32822
| * | | | Typo fix 'Sempahore' to 'Semaphore'James Heimbuck2019-09-121-1/+1
|/ / / /
* | | | Merge branch '66454-job-log-component' into 'master'Kushal Pandya2019-09-1212-60/+511
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Creates job log component See merge request gitlab-org/gitlab-ce!32764
| * | | | Creates job log componentFilipa Lacerda2019-09-1212-60/+511
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates vue and vuex support for new job log Creates the new log.vue component to handle the new format Updates the store to use the new parser Creates an utility function to handle the incremental log
* | | | Merge branch 'sh-revert-graphiql-version' into 'master'Kamil Trzciński2019-09-123-13/+95
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Make /-/graphql-explorer work again See merge request gitlab-org/gitlab-ce!32952
| * | | | Add CSP nonce to graphiql-rails JavaScriptsh-revert-graphiql-versionStan Hu2019-09-112-3/+5
| | | | |
| * | | | Revert "Update to graphiql-rails v1.7.10"Stan Hu2019-09-113-13/+93
| | | | | | | | | | | | | | | | | | | | This reverts commit f222e74d455ec9fc10efb783ffe4684836cc1c3b.
* | | | | Merge branch 'fix-interruptible-scope-name' into 'master'Kamil Trzciński2019-09-122-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixes non interruptible scope name See merge request gitlab-org/gitlab-ce!32940
| * | | | | Fixes non interruptible scope nameCédric Tabin2019-09-122-2/+2
| | |_|/ / | |/| | |
* | | | | Merge branch 'fix-invalid-formdata-usage' into 'master'Kushal Pandya2019-09-122-7/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix invalid usage of FormData in karma tests See merge request gitlab-org/gitlab-ce!32865
| * | | | | Fix FormData usage in karma testsfix-invalid-formdata-usageIllya Klymov2019-09-102-7/+4
| | | | | |
* | | | | | Merge branch 'create-amazon-eks-cluster-form-skeleton' into 'master'Kushal Pandya2019-09-1219-8/+156
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create EKS cluster Vue app skeleton See merge request gitlab-org/gitlab-ce!32479
| * | | | | | Include AWS SDK as packge dependencycreate-amazon-eks-cluster-form-skeletonEnrique Alcantara2019-09-115-14/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Load EKS create cluster form as dynamic import dependency. - Include aws-sdk dependency in package.json
| * | | | | | Remove service credentials objectEnrique Alcantara2019-09-111-4/+0
| | | | | | |
| * | | | | | Create EKS cluster Vue app skeletonEnrique Alcantara2019-09-1117-0/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add AWS SDK Dependency - Create placeholders for Vue components - Create store with state structure
* | | | | | | Merge branch 'bw-asset-proxy-markdown-bump' into 'master'Jan Provaznik2019-09-122-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump the CACHE_COMMONMARK_VERSION See merge request gitlab-org/gitlab-ce!32935
| * | | | | | | Bump the CACHE_COMMONMARK_VERSIONbw-asset-proxy-markdown-bumpBrett Walker2019-09-112-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to ensure any markdown generated before the asset proxy default was corrected is re-generated
* | | | | | | | Merge branch '62122-hide-resolve-thread-button-from-guest' into 'master'Kushal Pandya2019-09-125-1/+29
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide resolve thread button from guest Closes #62122 See merge request gitlab-org/gitlab-ce!32859
| * | | | | | | | Hide resolve thread button from guestSamantha Ming2019-09-125-1/+29
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | - Show if user can_resolve all of the notes
* | | | | | | | Merge branch 'fix-missing-listissue' into 'master'Kushal Pandya2019-09-121-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing ListIssue import See merge request gitlab-org/gitlab-ce!32850
| * | | | | | | | Add missing ListIssue importfix-missing-listissueIllya Klymov2019-09-101-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'da-geo-high-availability-docs' into 'master'Evan Read2019-09-121-2/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Geo - Update HA docs to recommend Gitaly over NFS See merge request gitlab-org/gitlab-ce!32912
| * | | | | | | | Update Geo HA docs to recommend Gitaly over NFSda-geo-high-availability-docsDouglas Barbosa Alexandre2019-09-111-2/+6
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'qa-ml-fix-nplus-pipeline' into 'master'Sanad Liaquat2019-09-122-3/+9
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Fix failing E2E N+1 pipelines See merge request gitlab-org/gitlab-ce!32913
View Lorry Controller Status