summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | Merge branch '47265-inputs-labels-alignment' into 'master'Clement Ho2018-06-121-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Alignment of labels within two column layouts for radio and check boxes" Closes #47265 See merge request gitlab-org/gitlab-ce!19671
| * | | | | | | | | | | | | | | Remove top padding from .col-form-label47265-inputs-labels-alignmentAnnabel Dunstone Gray2018-06-111-0/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'fix-labels-too-large-from-label-list-redesign' into 'master'Annabel Gray2018-06-121-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix labels too large Closes #47499 and #47762 See merge request gitlab-org/gitlab-ce!19640
| * | | | | | | | | | | | | | | Fix labels too largeLuke Bennett2018-06-121-1/+5
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'ide-job-loading-empty-state' into 'master'Filipa Lacerda2018-06-122-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed IDE jobs empty state showing when loading Closes #47766 See merge request gitlab-org/gitlab-ce!19706
| * | | | | | | | | | | | | Fixed IDE jobs empty state showing when loadingide-job-loading-empty-statePhil Hughes2018-06-122-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #47766
* | | | | | | | | | | | | | Merge branch 'pr-importer-io-extra-error-handling' into 'master'Nick Thomas2018-06-123-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure MR diffs always exist in the PR importer Closes #47312 See merge request gitlab-org/gitlab-ce!19704
| * | | | | | | | | | | | | | Ensure MR diffs always exist in the PR importerpr-importer-io-extra-error-handlingYorick Peterse2018-06-123-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In rare cases it could happen that an MR was created, but creating the MR diffs somehow failed (e.g. due to an error). This commit adds an additional check to make sure MR diffs are always present when importing GitHub pull requests.
* | | | | | | | | | | | | | | Merge branch 'gitaly-disk-access-3' into 'master'Douwe Maan2018-06-1231-185/+301
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Find and mark more Git disk access locations, part 2 See merge request gitlab-org/gitlab-ce!19437
| * | | | | | | | | | | | | | | Find and mark more Git disk access locations, part 2Jacob Vosmaer2018-06-1231-185/+301
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'fix/br-decode' into 'master'Phil Hughes2018-06-123-6/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mergeError message has been binded using v-html directive See merge request gitlab-org/gitlab-ce!19058
| * | | | | | | | | | | | | | | mergeError message has been binded using v-html directiveMurat Dogan2018-06-123-6/+30
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'replace-dots-with-ellipsis' into 'master'Annabel Gray2018-06-1213-17/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace ... with ellipsis in placeholders See merge request gitlab-org/gitlab-ce!19627
| * | | | | | | | | | | | | | | 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_adapter Closes #47577 See merge request gitlab-org/gitlab-ce!19641
| * | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' i18n: document how to use links without splitting sentences See merge request gitlab-org/gitlab-ce!19682
| * | | | | | | | | | | | | | | 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}_URL See merge request gitlab-org/gitlab-ce!19618
| * | | | | | | | | | | | | | | Add CI_{PIPELINE,JOB}_URLexpose-ci-urlKamil Trzciński2018-06-126-2/+16
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch ↵Rémy Coutable2018-06-122-9/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'blackst0ne-rails5-actionview-missingtemplate-in-spec-features-projects-wiki-user_views_wiki_page_spec-rb' into 'master' Resolve "[Rails5] `ActionView::MissingTemplate` in spec/features/projects/wiki/user_views_wiki_page_spec.rb" Closes #47738 See merge request gitlab-org/gitlab-ce!19685
| * | | | | | | | | | | | | | | | Resolve "[Rails5] `ActionView::MissingTemplate` in ↵blackst0ne2018-06-122-9/+13
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spec/features/projects/wiki/user_views_wiki_page_spec.rb"
* | | | | | | | | | | | | | | | Merge branch 'blackst0ne-add-gemfile-rails5-lock-check' into 'master'Rémy Coutable2018-06-123-0/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CI job to check Gemfile.rails5.lock See merge request gitlab-org/gitlab-ce!19605
| * | | | | | | | | | | | | | | | 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 example See merge request gitlab-org/gitlab-ce!19598
| * | | | | | | | | | | | | | | Remove unnecessary and broken examplemk/remove-unnecessary-and-broken-example-docsMichael Kozono2018-06-081-5/+1
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The example provided was broken because it mistakes a bug for a regression. It is not needed for clarity anyway. The milestone part is no longer relevant as well.
* | | | | | | | | | | | | | | Merge branch 'da-port-cte-to-ce' into 'master'Yorick Peterse2018-06-123-0/+97
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Gitlab::SQL:CTE for easily building CTE statements See merge request gitlab-org/gitlab-ce!19652
| * | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qa 112 fix auto devops cluster spec See merge request gitlab-org/gitlab-ce!19584
| * | | | | | | | | | | | | | | | 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.io See merge request gitlab-org/gitlab-ce!19688
| * | | | | | | | | | | | | | | | | Use nip.io instead of xip.iodz-use-nip-ioDmitriy Zaporozhets2018-06-124-16/+16
| | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | | | | | Merge branch 'update-profile-preferences-docs' into 'master'Marcia Ramos2018-06-124-6/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add navigation theme documentation See merge request gitlab-org/gitlab-ce!19645
| * | | | | | | | | | | | | | | | | 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-out See merge request gitlab-org/gitlab-ce!19644
| * | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE: Unify app/views/ci/variables/_variable_row.html.haml See merge request gitlab-org/gitlab-ce!19594
| * | | | | | | | | | | | | | | | | 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 IDE Closes #47696 See merge request gitlab-org/gitlab-ce!19647
| * | | | | | | | | | | | | | | | | Fix width of project avatar in Web IDEide-project-imgPhil Hughes2018-06-111-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #47696
* | | | | | | | | | | | | | | | | Merge branch ↵Achilleas Pipinellis2018-06-121-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '47731-update-docs-as-gke-cluster-creation-label-has-changed-from-project-id-to-project' into 'master' Resolve "Update docs as GKE cluster creation label has changed from "project ID" to "project"" Closes #47731 See merge request gitlab-org/gitlab-ce!19676
| * | | | | | | | | | | | | | | | Resolve "Update docs as GKE cluster creation label has changed from "project ↵Dennis Tang2018-06-121-5/+5
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ID" to "project""
* | | | | | | | | | | | | | | | Merge branch 'remove-favicon-blue.ico' into 'master'Douwe Maan2018-06-121-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove favicon-blue.ico because it's no longer used See merge request gitlab-org/gitlab-ce!19658
| * | | | | | | | | | | | | | | | 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.md See merge request gitlab-org/gitlab-ce!19679
| * | | | | | | | | | | | | | | | 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 warning Closes gitlab-ee#6382 See merge request gitlab-org/gitlab-ce!19668