summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Move ModuleWithInstanceVariables to Gitlab namespaceLin Jen-Shin2017-11-2243-240/+198
* Explain how to disable it in the docLin Jen-Shin2017-11-222-3/+29
* Just define allowed_ids and override it with empty valueLin Jen-Shin2017-11-227-16/+10
* Updates based on feedbackLin Jen-Shin2017-11-227-121/+108
* Remove codes from bad mergeLin Jen-Shin2017-11-181-2/+0
* Allow initialize method and single ivarLin Jen-Shin2017-11-182-3/+46
* Use StrongMemoize and enable/disable cops properlyLin Jen-Shin2017-11-1848-169/+193
* Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-171064-8722/+28956
|\
| * Merge branch 'sh-background-migration-move-mr-diff-id' into 'master'Sean McGivern2017-11-175-33/+130
| |\
| | * Convert migration to populate latest merge request ID into a background migra...Stan Hu2017-11-175-33/+130
| * | Merge branch 'dropdown-docs' into 'master'Phil Hughes2017-11-172-0/+40
| |\ \
| | * | Add dropdowns documentationFilipa Lacerda2017-11-172-0/+40
| |/ /
| * | Merge branch 'mk-update-database-debugging' into 'master'Yorick Peterse2017-11-171-4/+11
| |\ \
| | * | Update database_debugging.mdmk-update-database-debuggingMichael Kozono2017-11-161-4/+11
| * | | Merge branch 'rc/use-existing-url-helper' into 'master'Grzegorz Bizon2017-11-174-19/+11
| |\ \ \
| | * | | Replace ci_status_path with pipeline_pathrc/use-existing-url-helperRémy Coutable2017-11-144-19/+11
| * | | | Merge branch 'sh-deduplicate-background-migration-specs' into 'master'Sean McGivern2017-11-172-32/+6
| |\ \ \ \
| | * | | | De-duplicate background migration matchers defined in spec/support/migrations...sh-deduplicate-background-migration-specsStan Hu2017-11-162-32/+6
| | | |_|/ | | |/| |
| * | | | Merge branch 'patch-28' into 'master'Achilleas Pipinellis2017-11-171-1/+3
| |\ \ \ \
| | * | | | Update HA README.md to clarify GitLab support does not troubleshoot DRBD.Lee Matos2017-11-161-1/+3
| * | | | | Merge branch 'fix/sm/fix-condeclimate-version' into 'master'Winnie Hellmann2017-11-171-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Set 0.69.0 instead of latest for codeclimate imageShinya Maeda2017-11-171-1/+1
| |/ / / /
| * | | | Merge branch 'docs/refactor-cluster' into 'master'Marcia Ramos2017-11-162-33/+47
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Move installation of apps higherdocs/refactor-clusterAchilleas Pipinellis2017-11-161-12/+13
| | * | | Change to Google Kubernetes Cluster and add internal linksAchilleas Pipinellis2017-11-161-9/+9
| | * | | Add Ingress description from official docsAchilleas Pipinellis2017-11-161-1/+1
| | * | | Add info on creating your own k8s cluster from the cluster pageAchilleas Pipinellis2017-11-161-21/+32
| | * | | Add info about the installed apps in the Cluster docsAchilleas Pipinellis2017-11-162-10/+12
| * | | | Update database_debugging.mdMichael Kozono2017-11-161-4/+3
| |/ / /
| * | | Merge branch '37508-lock-confidential-issuable-sidebar-custom-svg-icons-itera...Tim Zallmann2017-11-169-60/+96
| |\ \ \
| | * | | Resolve "lock/confidential issuable sidebar custom svg icons iteration"Luke "Jared" Bennett2017-11-169-60/+96
| |/ / /
| * | | Merge branch 'bvl-isolate-fork-network-background-migrations' into 'master'Rémy Coutable2017-11-161-11/+11
| |\ \ \ | | |/ / | |/| |
| | * | Isolate the fork network background migrationsbvl-isolate-fork-network-background-migrationsBob Van Landuyt2017-11-151-11/+11
| * | | Merge branch 'cache-user-keys-count' into 'master'Douwe Maan2017-11-1613-29/+262
| |\ \ \
| | * | | Cache the number of user SSH keyscache-user-keys-countYorick Peterse2017-11-1613-29/+262
| * | | | Merge branch 'brand_header_change' into 'master'Annabel Dunstone Gray2017-11-164-2/+14
| |\ \ \ \
| | * | | | When a custom header logo is present, don't show GitLab type logoDrew Blessing2017-11-154-2/+14
| * | | | | Merge branch 'dm-notes-actions-noteable-for-update' into 'master'Sean McGivern2017-11-164-3/+36
| |\ \ \ \ \
| | * | | | | Make sure NotesActions#noteable returns a Noteable in the update actiondm-notes-actions-noteable-for-updateDouwe Maan2017-11-164-3/+36
| | |/ / / /
| * | | | | Merge branch 'winh-update-license_finder' into 'master'Rémy Coutable2017-11-163-3/+43
| |\ \ \ \ \
| | * | | | | Update license_finder to 3.1.1Winnie Hellmann2017-11-163-3/+43
| |/ / / / /
| * | | | | Merge branch 'bvl-adjust-openid_connect_spec' into 'master'Sean McGivern2017-11-161-2/+11
| |\ \ \ \ \
| | * | | | | Adjust openid_connect_spec to use `raise_error`Bob Van Landuyt2017-11-161-2/+11
| * | | | | | Merge branch 'backport-delete-epic' into 'master'Filipa Lacerda2017-11-168-20/+103
| |\ \ \ \ \ \
| | * | | | | | Backport delete epic changesbackport-delete-epicClement Ho2017-11-158-20/+103
| * | | | | | | Merge branch 'simplify-docs-review-script' into 'master'Rémy Coutable2017-11-161-11/+24
| |\ \ \ \ \ \ \
| | * | | | | | | Change logic of repo name and slugs in docs review scriptsimplify-docs-review-scriptAchilleas Pipinellis2017-11-161-11/+24
| * | | | | | | | Merge branch 'fix/git-env-repo-paths' into 'master'Douwe Maan2017-11-163-11/+51
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Use relative git object paths to construct absolute ones before setting Envfix/git-env-repo-pathsAhmad Sherif2017-11-143-11/+51
| * | | | | | | | | Merge branch 'docs/db-debugging' into 'master'Yorick Peterse2017-11-162-0/+50
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |