summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | Merge branch '57239-remove-unused-h3-w3-classes' into 'master'Phil Hughes2019-05-151-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused h-3 and w-3 classes Closes #57239 See merge request gitlab-org/gitlab-ce!28297
| * | | | | | | | | | | | | | | | | | | | | | Remove unused h-3 and w-3 classes57239-remove-unused-h3-w3-classesPaul Slaughter2019-05-131-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They were introduced in [this mr][1], with the intention of using the. Appaarently the usage was removed during review, but the new classes accidentally stayed around. [1]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24724
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'clone-panel-scb' into 'master'Phil Hughes2019-05-151-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in _clone_panel See merge request gitlab-org/gitlab-ce!28309
| * | | | | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in _clone_panelclone-panel-scbLuke Bennett2019-05-141-0/+5
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of single codebase changes.
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'zero-auth-proj-scb' into 'master'Phil Hughes2019-05-153-5/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in zero_authorized_projects See merge request gitlab-org/gitlab-ce!28260
| * | | | | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in zero_authorized_projectszero-auth-proj-scbLuke Bennett2019-05-113-5/+20
| | |_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of single codebase changes.
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tabs-ldap-scb' into 'master'Phil Hughes2019-05-151-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in devise ldap tabs See merge request gitlab-org/gitlab-ce!28252
| * | | | | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in devise ldap tabstabs-ldap-scbLuke Bennett2019-05-101-0/+1
| | |_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of single codebase changes.
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'next-badge-link' into 'master'Kushal Pandya2019-05-152-2/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add link to next badge Closes #61503 See merge request gitlab-org/gitlab-ce!28162
| * | | | | | | | | | | | | | | | | | | | | | Remove trailing whitespace for lintnext-badge-linkMarcel van Remmerden2019-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Finish rebase processMarcel van Remmerden2019-05-131-0/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | Resolve merge conflictMarcel van Remmerden2019-05-071-3/+4
| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Change sizes from px to variablesMarcel van Remmerden2019-05-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Refactor badge with link layoutMarcel van Remmerden2019-05-072-22/+18
| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Adapt code to style guidelinesMarcel van Remmerden2019-05-072-9/+9
| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Remove trailing whitespacesMarcel van Remmerden2019-05-071-4/+3
| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Remove whitespaceMarcel van Remmerden2019-05-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Fix new linesMarcel van Remmerden2019-05-071-1/+7
| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Add badge link and adapt visual style to badges Marcel van Remmerden2019-05-072-2/+18
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Add badge link and adapt visual style to badges Marcel van Remmerden2019-05-131-3/+4
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bvl-add-corrilation-id-to-all-exception' into 'master'Douglas Barbosa Alexandre2019-05-143-10/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add correlation id to all sentry errors Closes #61699 See merge request gitlab-org/gitlab-ce!28253
| * | | | | | | | | | | | | | | | | | | | | | | Add correlation id to all sentry errorsBob Van Landuyt2019-05-133-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this, we were only adding the correlation id to the "acceptable exceptions" which we handle in code. But we need to add it to the default raven context so the information would be available for uncaught exceptions.
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'patch-56' into 'master'Evan Read2019-05-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo See merge request gitlab-org/gitlab-ce!28276
| * | | | | | | | | | | | | | | | | | | | | | | | Fix typoNicholas Bishop2019-05-141-1/+1
|/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'make-autocomplete-faster-with-lots-of-results' into 'master'53811-move-multiple-issue-boards-for-projects-to-coreStan Hu2019-05-1410-7/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimise upload path calls See merge request gitlab-org/gitlab-ce!28264
| * | | | | | | | | | | | | | | | | | | | | | | Optimise upload path callsSean McGivern2019-05-1410-7/+23
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | String#underscore isn't particularly slow, but it's possible for us to call it many times in a users autocomplete request, with mostly-static values ('User', 'Group', etc.). We can memoise this and save a surprising amount of time (around 10% of the total request time in some cases).
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fix-slow-preview-note-specs' into 'master'Sean McGivern2019-05-141-6/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix hiding of quick action prompt in specs See merge request gitlab-org/gitlab-ce!28285
| * | | | | | | | | | | | | | | | | | | | | | Fix hiding of quick action prompt in specsfix-slow-preview-note-specsHeinrich Lee Yu2019-05-141-6/+4
| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'patch-58' into 'master'Stan Hu2019-05-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | delete feature flag when disabling Rugged See merge request gitlab-org/gitlab-ce!28289
| * | | | | | | | | | | | | | | | | | | | | | | delete feature flag when disabling RuggedBen Bodenmiller2019-05-131-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'single-codebase-favicon-specs-ce' into 'master'Rémy Coutable2019-05-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EE Backport to CE of EE!12404 See merge request gitlab-org/gitlab-ce!28292
| * | | | | | | | | | | | | | | | | | | | | | | EE backport to CE of favicon_spec.rbsingle-codebase-favicon-specs-cemove-ee-favicon-spec-changes-to-eelmcandrew2019-05-131-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fix-project-visibility-level-validation' into 'master'Stan Hu2019-05-143-2/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix project visibility level validation Closes #59379 See merge request gitlab-org/gitlab-ce!28305
| * | | | | | | | | | | | | | | | | | | | | | | Fix project visibility level validationPeter Marko2019-05-143-2/+18
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch '55583-rename-method-conflicts' into 'master'Jan Provaznik2019-05-1412-46/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename methods that conflict in Rails 5.2 Closes #55583 See merge request gitlab-org/gitlab-ce!28281
| * | | | | | | | | | | | | | | | | | | | | | Rename methods that conflict in Rails 5.255583-rename-method-conflictsHeinrich Lee Yu2019-05-1212-46/+46
| | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds suffix to enum methods and changes `in_groups` to `of_groups`
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'docs/mermaid-supported-by-docs-site' into 'master'Achilleas Pipinellis2019-05-142-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use real mermaid for mermaid result See merge request gitlab-org/gitlab-ce!28300
| * | | | | | | | | | | | | | | | | | | | | | Use real mermaid for mermaid resultEvan Read2019-05-142-4/+9
|/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'docs-writing-e2e-tests' into 'master'Mark Lapierre2019-05-134-3/+423
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First iteration of documentation for writing end-to-end tests See merge request gitlab-org/gitlab-ce!27603
| * | | | | | | | | | | | | | | | | | | | | | This is the first iteration of documentation for the GitLab QAWalmyr2019-05-134-3/+423
|/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | framework that intends to make easier for every engineer to contribute with the end-to-end tests creation, edition, and improvements.
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'docs/improve-installation-from-source' into 'master'Evan Read2019-05-131-0/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve installation from source Closes #47483, #61549, and #50937 See merge request gitlab-org/gitlab-ce!28201
| * | | | | | | | | | | | | | | | | | | | | | Improve installation from sourceDmitriy Zaporozhets2019-05-131-0/+30
|/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add a solution for JavaScript heap out of memory error when compiling assets * Add note about postgres database config * Start gitaly before gitlab:setup as it won't work otherwise Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | | | | | | | | | | Merge branch ↵Evan Read2019-05-133-0/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '9228-geo-how-to-reconcile-differences-with-geo-checksum-mismatches-docs' into 'master' Document how to reconcile differences with Geo checksum mismatches Closes gitlab-ee#9228 See merge request gitlab-org/gitlab-ce!28183
| * | | | | | | | | | | | | | | | | | | | | Document how to reconcile differences with Geo checksum mismatchesDouglas Barbosa Alexandre2019-05-133-0/+36
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ruby-parser-rb-2-6' into 'master'Stan Hu2019-05-131-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update ruby_parser for ruby 2.6 See merge request gitlab-org/gitlab-ce!28295
| * | | | | | | | | | | | | | | | | | | | Update ruby_parser for ruby 2.6ruby-parser-rb-2-6Luke Bennett2019-05-131-2/+2
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch '61302-remove-ignore_column-ci_cd' into 'master'Douglas Barbosa Alexandre2019-05-131-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove ignore_column ci_id" Closes #61302 See merge request gitlab-org/gitlab-ce!28234
| * | | | | | | | | | | | | | | | | | | | Remove ignore_column from Project model61302-remove-ignore_column-ci_cdDmitriy Zaporozhets2019-05-101-1/+0
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | | | | | | | | Merge branch 'winh-frontend-tests-check-dependencies' into 'master'Kushal Pandya2019-05-131-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that dependencies are installed before running frontend tests See merge request gitlab-org/gitlab-ce!28236
| * | | | | | | | | | | | | | | | | | | | Ensure that dependencies are installed before running frontend testswinh-frontend-tests-check-dependenciesWinnie Hellmann2019-05-131-0/+4
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | |