summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Ensure MR diffs always exist in the PR importerpr-importer-io-extra-error-handlingYorick Peterse2018-06-123-1/+19
* 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
* | | | | | | | | Merge branch 'jivl-fix-import-gitlab-project-page' into 'master'Annabel Gray2018-06-111-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix styling of the gitlab import pageJose2018-06-111-1/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '47245-hr-avatar' into 'master'Clement Ho2018-06-111-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Hide overflow on hrAnnabel Dunstone Gray2018-06-111-0/+4
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '47604-avatars-and-system-icons-for-mobile' into 'master'Clement Ho2018-06-112-2/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make avatars/icons hidden on mobileTakuya Noguchi2018-06-082-2/+7
* | | | | | | | | | Merge branch '47522-revert-mr-modal' into 'master'Annabel Gray2018-06-112-11/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove .row and .col-sm-12Clement Ho2018-06-111-9/+8
| * | | | | | | | | | Fix styling of revert MR modaltauriedavis2018-06-082-4/+5
* | | | | | | | | | | Merge branch 'jivl-fix-collapse-sidebar-button-color' into 'master'Clement Ho2018-06-111-0/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix collapse sidebar button colorJose2018-06-111-0/+8
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '47338-sign-in-btn' into 'master'Clement Ho2018-06-114-11/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix alignment of sign in/sign up buttonAnnabel Dunstone Gray2018-06-084-11/+7
* | | | | | | | | | | Merge branch 'correct-gray-600' into 'master'Annabel Gray2018-06-111-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |