summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | Revert extra CSS causing Gitaly Servers table to be misalginedStan Hu2018-06-101-1/+1
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #47648
* | | | | | | | | | | | | | | | Merge branch 'jprovazn-rails5-boards' into 'master'Rémy Coutable2018-06-111-6/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Rails5] Fix conversion of integer into string in board spec Closes #47653 See merge request gitlab-org/gitlab-ce!19616
| * | | | | | | | | | | | | | | Fix conversion of integer into string in board specJan Provaznik2018-06-091-6/+12
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In rails 5 controller specs, integers are converted to strings unless conte-type is set with `as: :json`: https://github.com/rails/rails/issues/26069
* | | | | | | | | | | | | | | Merge branch '47684-uploads-specs-are-failing-on-master' into 'master'Sean McGivern2018-06-114-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Uploads specs are failing on master" Closes #47684 See merge request gitlab-org/gitlab-ce!19638
| * | | | | | | | | | | | | | Don't use Rails.root.join for upload fixture pathsRémy Coutable2018-06-114-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | Merge branch 'ide-etag-polling' into 'master'Filipa Lacerda2018-06-114-28/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix IDE pipelines eTagPoll not stopping Closes #47678 See merge request gitlab-org/gitlab-ce!19636
| * | | | | | | | | | | | | | | fixed specsPhil Hughes2018-06-111-18/+29
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix IDE pipelines eTagPoll not stoppingPhil Hughes2018-06-113-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #47678
* | | | | | | | | | | | | | | | Merge branch 'docs-11-0-installation-from-source-guide' into 'master'Mayra Cabrera2018-06-112-2/+364
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update installation from source guide See merge request gitlab-org/gitlab-ce!19320
| * | | | | | | | | | | | | | | | Fix formattingStan Hu2018-06-081-10/+10
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Update Ruby upgrade instructions for 11.0Stan Hu2018-06-081-4/+4
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Update installation.mddocs-11-0-installation-from-source-guideFilipa Lacerda2018-06-051-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Create update guideFilipa Lacerda2018-06-011-0/+362
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Update installation from source guideFilipa Lacerda2018-06-011-2/+2
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'leipert-add-memory-info' into 'master'Tim Zallmann2018-06-112-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set `max_old_space_size` option of node to 3.5GB during compile:assets See merge request gitlab-org/gitlab-ce!19624
| * | | | | | | | | | | | | | | | | set max_old_space_size to 3.5 GB for compile-assets jobLukas Eipert2018-06-112-1/+7
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'sh-suppress-env-leaks' into 'master'Kamil Trzciński2018-06-111-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent ENV from leaking variables in CI output See merge request gitlab-org/gitlab-ce!19607
| * | | | | | | | | | | | | | | | | Prevent ENV from leaking variables in CI outputStan Hu2018-06-081-0/+2
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'use-tooltip-component-in-mr-widget-author-time-component' into ↵Filipa Lacerda2018-06-116-12/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Use Tooltip component in MrWidgetAuthorTime vue component See merge request gitlab-org/gitlab-ce!19635
| * | | | | | | | | | | | | | | | | | Update MrWidgetAuthorTime and MRWidgetMerged specGeorge Tsiolis2018-06-112-2/+2
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Rename MrWidgetAuthorTime vue componentGeorge Tsiolis2018-06-115-8/+13
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Use Tooltip component in MrWidgetAuthorTime vue componentGeorge Tsiolis2018-06-111-2/+5
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'fj-relax-url-validator-rules-for-user' into 'master'Douwe Maan2018-06-119-27/+116
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid checking the user format in every url validation Closes #47526 See merge request gitlab-org/gitlab-ce!19575
| * | | | | | | | | | | | | | | | | | | Avoid checking the user format in every url validationFrancisco Javier López2018-06-119-27/+116
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'unify-views-search-results' into 'master'Douwe Maan2018-06-113-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide project name if searching against a project See merge request gitlab-org/gitlab-ce!19595
| * | | | | | | | | | | | | | | | | | | Hide project name if searching against a projectLin Jen-Shin2018-06-112-1/+6
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Unify app/views/search/results by using EELin Jen-Shin2018-06-112-2/+3
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'gitaly-1215-ca-count-commits' into 'master'Sean McGivern2018-06-111-15/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate CycleAnalytics::CommitCount to Gitaly Closes gitaly#1215 See merge request gitlab-org/gitlab-ce!19481
| * | | | | | | | | | | | | | | | | | | Migrate CycleAnalytics::CommitCount to GitalyKim Carlbäcker2018-06-111-15/+5
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'jprovazn-rails5-opclasses' into 'master'Yorick Peterse2018-06-111-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Rails5] Add missing `:comment` attribute Closes #47650 See merge request gitlab-org/gitlab-ce!19612
| * | | | | | | | | | | | | | | | | | | Add missing `:comment` attributeJan Provaznik2018-06-101-1/+6
| | |_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails 5 IndexDefinition contains also `:comment` attribute.
* | | | | | | | | | | | | | | | | | | Merge branch '47679-fix-failed-jobs-tab-ie11' into 'master'Phil Hughes2018-06-112-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Table on Failed Jobs tab is overflowing in IE11 and sm screens" Closes #47679 See merge request gitlab-org/gitlab-ce!19637
| * | | | | | | | | | | | | | | | | | Resolve "Table on Failed Jobs tab is overflowing in IE11 and sm screens"André Luís2018-06-112-0/+10
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'gitlab-git-nlbr' into 'master'Sean McGivern2018-06-1122-47/+82
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use Gitlab::Utils.nlbr in Gitlab::Git See merge request gitlab-org/gitlab-ce!18335
| * | | | | | | | | | | | | | | | | | Don't use Gitlab::Utils.nlbr in Gitlab::GitJacob Vosmaer (GitLab)2018-06-1122-47/+82
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'gitaly-commit-count-opt-out' into 'master'Sean McGivern2018-06-113-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move gitaly_blame, gitaly_count_commits, gitaly_commit_count to opt-out See merge request gitlab-org/gitlab-ce!19591
| * | | | | | | | | | | | | | | | | | Move gitaly_blame, gitaly_count_commits, gitaly_commit_count to opt-outJacob Vosmaer (GitLab)2018-06-113-3/+8
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'rs-update-rspec' into 'master'Rémy Coutable2018-06-1145-94/+90
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update rspec to 3.7 See merge request gitlab-org/gitlab-ce!19449
| * | | | | | | | | | | | | | | | | | Correct more usages of non-relative `fixture_file_upload` pathsRobert Speicher2018-06-078-19/+13
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Make all uses of `fixture_file_upload` use relative pathsRobert Speicher2018-06-0737-58/+60
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Update rspec to 3.7Robert Speicher2018-06-072-18/+18
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'rails5-enum-nil' into 'master'Sean McGivern2018-06-113-21/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable mapping to nil in enums Closes #47032 and #46279 See merge request gitlab-org/gitlab-ce!19288
| * | | | | | | | | | | | | | | | | | Enable mapping to nil in enumsJan Provaznik2018-06-063-21/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enum in Rails 5 does not map nil values - IOW nil value remains nil, even if there is a key with nil value in the enum definition. This commit overrides the underlying Enum methods so nil value is still mapped. This solution is far from being ideal: it uses dynamic definition of methods which introduces more magic/confusion into the codebase. It would be better to get rid of the nil value in enums.
* | | | | | | | | | | | | | | | | | | Merge branch '44742-tech-debt' into 'master'Phil Hughes2018-06-111-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "`TimeTrackingComparisonPane` vue component tech debt" Closes #44742 See merge request gitlab-org/gitlab-ce!19593
| * | | | | | | | | | | | | | | | | | Uses tooltip correctly in comparion_pane component. Removes incorrect usage ↵Filipa Lacerda2018-06-081-6/+5
| | |_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of aria attributes
* | | | | | | | | | | | | | | | | | Merge branch 'sh-remove-sclau-docs' into 'master'Achilleas Pipinellis2018-06-111-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove SCLAU to mirror https://gitlab.com/gitlab-org/gitlab-ee/commit/cd5cef8f84a2b8c58a741e90afec232243a9f3a9 See merge request gitlab-org/gitlab-ce!19621
| * | | | | | | | | | | | | | | | | | Remove SCLAU to mirror ↵Stan Hu2018-06-101-4/+0
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/commit/cd5cef8f84a2b8c58a741e90afec232243a9f3a9
* | | | | | | | | | | | | | | | | | Merge branch 'upgrade-gitlab-markup' into 'master'Douwe Maan2018-06-113-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade gitlab-markup to fix render issue with reStructuredText See merge request gitlab-org/gitlab-ce!19596
| * | | | | | | | | | | | | | | | | Upgrade gitlab-markup to fix render issue with reStructuredTextGabriel Mazetto2018-06-083-3/+8
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'qa-wait-for-job-trace' into 'master'Grzegorz Bizon | off until 20th June2018-06-112-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update QA deploy key clone test to wait for job traces Closes gitlab-qa#269 See merge request gitlab-org/gitlab-ce!19557