summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into fl-eslint-vue-house-keepingfl-eslint-vue-house-keepingFilipa Lacerda2018-06-1280-165/+543
|\
| * Merge branch 'replace-dots-with-ellipsis' into 'master'Annabel Gray2018-06-1213-17/+17
| |\
| | * Replace ... with ellipsis in placeholdersreplace-dots-with-ellipsisAndreas Kämmerle2018-06-1113-17/+17
| * | Merge branch 'fj-bumping-gollum-lib-and-gollum-rugged-adapter' into 'master'Douwe Maan2018-06-123-2/+23
| |\ \
| | * | Bumping gitlab-gollum-lib and gitlab-gollum-rugged_adapterFrancisco Javier López2018-06-123-2/+23
| |/ /
| * | Merge branch 'docs-using-links-without-splitting-translated-sentences' into '...Douwe Maan2018-06-121-1/+22
| |\ \
| | * | i18n: document how to use links without splitting sentencesDennis Tang2018-06-121-1/+22
| |/ /
| * | Merge branch 'expose-ci-url' into 'master'Grzegorz Bizon | off until 20th June2018-06-126-2/+16
| |\ \
| | * | Add CI_{PIPELINE,JOB}_URLexpose-ci-urlKamil Trzciński2018-06-126-2/+16
| * | | Merge branch 'blackst0ne-rails5-actionview-missingtemplate-in-spec-features-p...Rémy Coutable2018-06-122-9/+13
| |\ \ \
| | * | | Resolve "[Rails5] `ActionView::MissingTemplate` in spec/features/projects/wik...blackst0ne2018-06-122-9/+13
| |/ / /
| * | | Merge branch 'blackst0ne-add-gemfile-rails5-lock-check' into 'master'Rémy Coutable2018-06-123-0/+31
| |\ \ \
| | * | | Add CI job to check Gemfile.rails5.lockblackst0ne2018-06-123-0/+31
| |/ / /
| * | | Merge branch 'mk/remove-unnecessary-and-broken-example-docs' into 'master'Marin Jankovski2018-06-121-5/+1
| |\ \ \
| | * | | Remove unnecessary and broken examplemk/remove-unnecessary-and-broken-example-docsMichael Kozono2018-06-081-5/+1
| * | | | Merge branch 'da-port-cte-to-ce' into 'master'Yorick Peterse2018-06-123-0/+97
| |\ \ \ \
| | * | | | Add CHANGELOGda-port-cte-to-ceDouglas Barbosa Alexandre2018-06-111-0/+5
| | * | | | Add Gitlab::SQL:CTE for easily building CTE statementsDouglas Barbosa Alexandre2018-06-112-0/+92
| * | | | | Merge branch 'qa-112-fix-auto-devops-cluster-spec' into 'master'Grzegorz Bizon | off until 20th June2018-06-124-5/+28
| |\ \ \ \ \
| | * | | | | Move ENV variables to Runtime::Env for auto devops QAqa-112-fix-auto-devops-cluster-specDylan Griffith2018-06-112-9/+17
| | * | | | | Explicitly require pathname in QA stepsDylan Griffith2018-06-082-0/+4
| | * | | | | Ensure --zone is passed to all gcloud commands for auto devops cluster specsDylan Griffith2018-06-081-3/+14
| * | | | | | Merge branch 'dz-use-nip-io' into 'master'Grzegorz Bizon | off until 20th June2018-06-124-16/+16
| |\ \ \ \ \ \
| | * | | | | | Use nip.io instead of xip.iodz-use-nip-ioDmitriy Zaporozhets2018-06-124-16/+16
| * | | | | | | Merge branch 'update-profile-preferences-docs' into 'master'Marcia Ramos2018-06-124-6/+36
| |\ \ \ \ \ \ \
| | * | | | | | | Add navigation theme documentationAndreas Kämmerle2018-06-124-6/+36
| |/ / / / / / /
| * | | | | | | Merge branch 'gitaly-opt-out-branch-tag' into 'master'Sean McGivern2018-06-122-8/+13
| |\ \ \ \ \ \ \
| | * | | | | | | Move Gitaly branch/tag/ref RPC's to opt-outJacob Vosmaer (GitLab)2018-06-122-8/+13
| |/ / / / / / /
| * | | | | | | Merge branch 'unify-ci-variables-form-row' into 'master'Kamil Trzciński2018-06-121-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Add render_if_exists to variable env scopeunify-ci-variables-form-rowLin Jen-Shin2018-06-091-0/+1
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 'ide-project-img' into 'master'Filipa Lacerda2018-06-121-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Fix width of project avatar in Web IDEide-project-imgPhil Hughes2018-06-111-1/+1
| * | | | | | | | Merge branch '47731-update-docs-as-gke-cluster-creation-label-has-changed-fro...Achilleas Pipinellis2018-06-121-5/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Resolve "Update docs as GKE cluster creation label has changed from "project ...Dennis Tang2018-06-121-5/+5
| |/ / / / / / / /
| * | | | | | | | Merge branch 'remove-favicon-blue.ico' into 'master'Douwe Maan2018-06-121-0/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | We already moved to png and this is no longer usedremove-favicon-blue.icoLin Jen-Shin2018-06-121-0/+0
| * | | | | | | | | Merge branch 'patch-28' into 'master'Douwe Maan2018-06-121-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix typo in doc/development/README.mdDennis Tang2018-06-121-1/+1
| | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'jr-6382-lfs-import-docs' into 'master'Douwe Maan2018-06-121-0/+0
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Update import screenshot without LFS warningjr-6382-lfs-import-docsJames Ramsay2018-06-111-0/+0
| * | | | | | | | | | Merge branch 'bvl-fix-maintainer-push-rejected' into 'master'Douwe Maan2018-06-124-4/+36
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fixes rejected pushes from maintainersbvl-fix-maintainer-push-rejectedBob Van Landuyt2018-06-114-4/+36
| | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'docs-coached-20180608-1' into 'master'Achilleas Pipinellis2018-06-121-13/+45
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | fixed/enhanced command-line documentationEdwin Torres2018-06-121-13/+45
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'blackst0ne-update-gemfile-rails5-lock' into 'master'Rémy Coutable2018-06-121-19/+19
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | [Rails5] Update Gitlab.rails5.lockblackst0ne-update-gemfile-rails5-lockblackst0ne2018-06-121-19/+19
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'fix-input-placeholder-color' into 'master'Annabel Gray2018-06-121-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix input placeholder text colorfix-input-placeholder-colorAndreas Kämmerle2018-06-111-1/+1
| * | | | | | | | | | Merge branch '47687-milestone-and-labels-dropdowns-are-misplaced-with-collaps...Annabel Gray2018-06-122-4/+4
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Resolve "Milestone and labels dropdowns are misplaced with collapsed sidebar"47687-milestone-and-labels-dropdowns-are-misplaced-with-collapsed-sidebarClement Ho2018-06-112-4/+4