summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use gitaly to figure out git version for usage ping48105-git-version-detection-using-gitalyBalasankar "Balu" C2018-06-191-1/+1
|
* Merge branch 'extra-ee-specific-lines-from-discussion-views' into 'master'Rémy Coutable2018-06-197-1/+11
|\ | | | | | | | | Extract EE-specific lines from discussion views See merge request gitlab-org/gitlab-ce!19831
| * Remove EE-specific code from new MR emailextra-ee-specific-lines-from-discussion-viewsSean McGivern2018-06-182-1/+3
| |
| * Remove EE-specific code from rejection mailerSean McGivern2018-06-182-0/+2
| |
| * Remove EE-specific code from logs tree dropdownSean McGivern2018-06-181-0/+2
| |
| * Remove EE-specific code from project milestone pageSean McGivern2018-06-181-0/+2
| |
| * Remove EE-specific code from blob headerSean McGivern2018-06-181-0/+2
| |
* | Merge branch 'docs/contributing-md-labels' into 'master'Rémy Coutable2018-06-191-34/+48
|\ \ | | | | | | | | | | | | Remove label examples from headings See merge request gitlab-org/gitlab-ce!19982
| * | Remove label examples from headingsAchilleas Pipinellis2018-06-191-34/+48
| | | | | | | | | | | | | | | Better make it clearer under each section what the labels are rather than listing a subset of them in the section title
* | | Merge branch 'zj-linguist-gitaly-mandatory' into 'master'Douwe Maan2018-06-191-27/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Move language detection to mandatory Closes gitaly#732 and gitaly#360 See merge request gitlab-org/gitlab-ce!19985
| * | | Move language detection to mandatoryZeger-Jan van de Weg2018-06-191-27/+19
| | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/732 Closes https://gitlab.com/gitlab-org/gitaly/issues/360
* | | | Merge branch 'zj-gitaly-squash' into 'master'Douwe Maan2018-06-191-27/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rebase and Squash in progress are Gitaly only Closes gitaly#865 and gitaly#1018 See merge request gitlab-org/gitlab-ce!19987
| * | | | Rebase and Squash in progress are Gitaly onlyZeger-Jan van de Weg2018-06-191-27/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/865 Closes https://gitlab.com/gitlab-org/gitaly/issues/1018
* | | | | Merge branch 'zj-info-attributes' into 'master'Douwe Maan2018-06-191-15/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move info attributes to mandatory Closes gitaly#1082 See merge request gitlab-org/gitlab-ce!19988
| * | | | | Move info attributes to mandatoryZeger-Jan van de Weg2018-06-191-15/+1
| |/ / / / | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/1082
* | | | | Merge branch 'zj-commit-count' into 'master'Douwe Maan2018-06-191-18/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move count commit to mandatory Closes gitaly#330 See merge request gitlab-org/gitlab-ce!19984
| * | | | | Move count commit to mandatoryZeger-Jan van de Weg2018-06-191-18/+2
| | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/330
* | | | | | Merge branch 'zj-gitaly-license-detection' into 'master'Douwe Maan2018-06-192-31/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | License detection happens solely through Gitaly now Closes gitaly#1026 See merge request gitlab-org/gitlab-ce!19986
| * | | | | | License detection happens soley through Gitaly nowZeger-Jan van de Weg2018-06-192-31/+11
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migration: https://gitlab.com/gitlab-org/gitaly/issues/1026 Conflicts: lib/gitlab/git/repository.rb
* | | | | | Merge branch 'replace-omniauth.org-sedo-doc' into 'master'Rémy Coutable2018-06-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix omniauth link, site has moved. See merge request gitlab-org/gitlab-ce!19957
| * | | | | | Fix omniauth link, site has moved.julianladisch2018-06-181-1/+1
| | | | | | |
* | | | | | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-06-191-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it explicit where is the gitlab.rb file See merge request gitlab-org/gitlab-ce!19963
| * | | | | | | Make it explicit where is the gitlab.rb fileMike Weilgart2018-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save people an extra Google search if this is the first doc they're reading.
* | | | | | | | Merge branch 'jr-45820-xcode-docs' into 'master'Douwe Maan2018-06-191-0/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Open in Xcode docs See merge request gitlab-org/gitlab-ce!19872
| * | | | | | | | Fix typosjr-45820-xcode-docsJames Ramsay2018-06-181-2/+2
| | | | | | | | |
| * | | | | | | | Add Open in Xcode docsJames Ramsay2018-06-141-0/+8
| | | | | | | | |
* | | | | | | | | Merge branch '48093-fix-flakey-notes-background-process-specs' into 'master'Rémy Coutable2018-06-191-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix flakey time-sensitive notes creation specs that rely on background Sidekiq jobs Closes #48093 See merge request gitlab-org/gitlab-ce!19979
| * | | | | | | | | Fix flakey time-sensitive specs that rely on notes background Sidekiq jobs48093-fix-flakey-notes-background-process-specsEric Eastwood2018-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/48093 We use `perform_enqueued_jobs` because it is "adapter-agnostic so it's better to use it over Sidekiq::Testing.inline!." -- https://gitlab.com/gitlab-org/gitlab-ce/issues/22991
* | | | | | | | | | Merge branch 'rails5-fix-46276' into 'master'Rémy Coutable2018-06-192-0/+18
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails5 fix format in uploads actions Closes #46276 See merge request gitlab-org/gitlab-ce!19907
| * | | | | | | | | | Rails5 fix format in uploads actionsJasper Maes2018-06-182-0/+18
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'rs-soft-removed-objects-spec-parity' into 'master'Rémy Coutable2018-06-191-7/+29
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring CE-EE parity to migrations/remove_soft_removed_objects_spec.rb See merge request gitlab-org/gitlab-ce!19966
| * | | | | | | | | | Bring CE-EE parity to migrations/remove_soft_removed_objects_spec.rbrs-soft-removed-objects-spec-parityRobert Speicher2018-06-181-7/+29
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'rs-spec-lib-gitlab-ci-parity' into 'master'Rémy Coutable2018-06-194-5/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract EE specific files/lines for spec/lib/gitlab/ci See merge request gitlab-org/gitlab-ce!19971
| * | | | | | | | | | Correct CE-EE parity in two CI-related specsrs-spec-lib-gitlab-ci-parityRobert Speicher2018-06-182-2/+2
| | | | | | | | | | |
| * | | | | | | | | | CE-EE parity to spec/lib/gitlab/ci/config_spec.rbRobert Speicher2018-06-181-1/+1
| | | | | | | | | | |
| * | | | | | | | | | CE-EE parity to spec/lib/gitlab/ci/yaml_processor_spec.rbRobert Speicher2018-06-181-1/+1
| | | | | | | | | | |
| * | | | | | | | | | CE-EE parity for spec/lib/gitlab/ci/pipeline/chain/populate_spec.rbRobert Speicher2018-06-181-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'rails5-nil-formats' into 'master'Rémy Coutable2018-06-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix nil formats test Closes #47833 See merge request gitlab-org/gitlab-ce!19941
| * | | | | | | | | | Fix nil formats testrails5-nil-formatsJan Provaznik2018-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the spec files sets `nil` value for env varialbe `action_dispatch.request.formats`. Rather than setting `nil` value, we can delete the `action_dispatch.request.formats` key from `env` (which should be closer to real use case anyway). The reason is that in Rails 5, `formats` method does not set default array of formats if the env key is already set (even if set to `nil`).
* | | | | | | | | | | Merge branch 'docs/fix-yaml-indentation' into 'master'Achilleas Pipinellis2018-06-191-44/+44
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix indentation in CI yaml See merge request gitlab-org/gitlab-ce!19737
| * | | | | | | | | | Fix indentation in CI yamlpityonline2018-06-141-44/+44
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'jivl-fix-checkbox-top-margin' into 'master'Annabel Gray2018-06-181-7/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove top margin from checkboxes in integrations page See merge request gitlab-org/gitlab-ce!19976
| * | | | | | | | | | | Remove top margin from checkboxes in integrations pageJose2018-06-181-7/+0
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '48072-bs4-labels-in-issues-system-notes-are-misaligned-again' ↵Annabel Gray2018-06-181-1/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "BS4: Labels in issues system notes are misaligned again" Closes #48072 See merge request gitlab-org/gitlab-ce!19972
| * | | | | | | | | | | Resolve "BS4: Labels in issues system notes are misaligned again"Clement Ho2018-06-181-1/+4
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '48050-add-full-commit-sha' into 'master'Tim Zallmann2018-06-184-3/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Use long sha version in MR widget copy to clipboard button" Closes #48050 See merge request gitlab-org/gitlab-ce!19955
| * | | | | | | | | | | Uses long sha version of the merged commit in MR widget copy to clipboard ↵48050-add-full-commit-shaFilipa Lacerda2018-06-184-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | button
* | | | | | | | | | | | Merge branch '46861-issuable-title-with-longer-username' into 'master'Clement Ho2018-06-184-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Buttons disappear on merge request page in some case Closes #46861 and #14348 See merge request gitlab-org/gitlab-ce!19176
| * | | | | | | | | | | Fix CSS for buttons not to be hidden on issues/MR titleTakuya Noguchi2018-06-034-2/+10
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ce-4966-persistent-flash-banner-styles' into 'master'Annabel Gray2018-06-181-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Backport: Add styles for persistent notice banner See merge request gitlab-org/gitlab-ce!19968
View Lorry Controller Status