| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | moved strings into constants fileide-commit-section-file-active-indicator | Phil Hughes | 2018-06-13 | 5 | -5/+18 |
| | | |||||
| * | fixed eslint | Phil Hughes | 2018-06-12 | 1 | -3/+5 |
| | | |||||
| * | added specs for is-active class | Phil Hughes | 2018-06-12 | 2 | -0/+25 |
| | | | | | added spec for openPendingTab in component | ||||
| * | more karma fixes | Phil Hughes | 2018-06-12 | 3 | -4/+9 |
| | | |||||
| * | karma updates | Phil Hughes | 2018-06-12 | 4 | -4/+7 |
| | | |||||
| * | Add active class to active file in IDE commit panel | Phil Hughes | 2018-06-11 | 4 | -2/+29 |
| | | | | | Closes #46051 | ||||
| * | Merge branch 'jprovazn-rails5-boards' into 'master' | Rémy Coutable | 2018-06-11 | 1 | -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 spec | Jan Provaznik | 2018-06-09 | 1 | -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 McGivern | 2018-06-11 | 4 | -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 paths | Rémy Coutable | 2018-06-11 | 4 | -4/+4 |
| | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | Merge branch 'ide-etag-polling' into 'master' | Filipa Lacerda | 2018-06-11 | 4 | -28/+51 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix IDE pipelines eTagPoll not stopping Closes #47678 See merge request gitlab-org/gitlab-ce!19636 | ||||
| | * | | | fixed specs | Phil Hughes | 2018-06-11 | 1 | -18/+29 |
| | | | | | |||||
| | * | | | Fix IDE pipelines eTagPoll not stopping | Phil Hughes | 2018-06-11 | 3 | -10/+22 |
| | | | | | | | | | | | | | | | | | Closes #47678 | ||||
| * | | | | Merge branch 'docs-11-0-installation-from-source-guide' into 'master' | Mayra Cabrera | 2018-06-11 | 2 | -2/+364 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Update installation from source guide See merge request gitlab-org/gitlab-ce!19320 | ||||
| | * | | | | Fix formatting | Stan Hu | 2018-06-08 | 1 | -10/+10 |
| | | | | | | |||||
| | * | | | | Update Ruby upgrade instructions for 11.0 | Stan Hu | 2018-06-08 | 1 | -4/+4 |
| | | | | | | |||||
| | * | | | | Update installation.mddocs-11-0-installation-from-source-guide | Filipa Lacerda | 2018-06-05 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Create update guide | Filipa Lacerda | 2018-06-01 | 1 | -0/+362 |
| | | | | | | |||||
| | * | | | | Update installation from source guide | Filipa Lacerda | 2018-06-01 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Merge branch 'leipert-add-memory-info' into 'master' | Tim Zallmann | 2018-06-11 | 2 | -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 job | Lukas Eipert | 2018-06-11 | 2 | -1/+7 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'sh-suppress-env-leaks' into 'master' | Kamil Trzciński | 2018-06-11 | 1 | -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 output | Stan Hu | 2018-06-08 | 1 | -0/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'use-tooltip-component-in-mr-widget-author-time-component' into ↵ | Filipa Lacerda | 2018-06-11 | 6 | -12/+20 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Use Tooltip component in MrWidgetAuthorTime vue component See merge request gitlab-org/gitlab-ce!19635 | ||||
| | * | | | | | | | Update MrWidgetAuthorTime and MRWidgetMerged spec | George Tsiolis | 2018-06-11 | 2 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Rename MrWidgetAuthorTime vue component | George Tsiolis | 2018-06-11 | 5 | -8/+13 |
| | | | | | | | | | |||||
| | * | | | | | | | Use Tooltip component in MrWidgetAuthorTime vue component | George Tsiolis | 2018-06-11 | 1 | -2/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'fj-relax-url-validator-rules-for-user' into 'master' | Douwe Maan | 2018-06-11 | 9 | -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 validation | Francisco Javier López | 2018-06-11 | 9 | -27/+116 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch 'unify-views-search-results' into 'master' | Douwe Maan | 2018-06-11 | 3 | -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 project | Lin Jen-Shin | 2018-06-11 | 2 | -1/+6 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Unify app/views/search/results by using EE | Lin Jen-Shin | 2018-06-11 | 2 | -2/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'gitaly-1215-ca-count-commits' into 'master' | Sean McGivern | 2018-06-11 | 1 | -15/+5 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate CycleAnalytics::CommitCount to Gitaly Closes gitaly#1215 See merge request gitlab-org/gitlab-ce!19481 | ||||
| | * | | | | | | | | Migrate CycleAnalytics::CommitCount to Gitaly | Kim Carlbäcker | 2018-06-11 | 1 | -15/+5 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch 'jprovazn-rails5-opclasses' into 'master' | Yorick Peterse | 2018-06-11 | 1 | -1/+6 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Rails5] Add missing `:comment` attribute Closes #47650 See merge request gitlab-org/gitlab-ce!19612 | ||||
| | * | | | | | | | | Add missing `:comment` attribute | Jan Provaznik | 2018-06-10 | 1 | -1/+6 |
| | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | In Rails 5 IndexDefinition contains also `:comment` attribute. | ||||
| * | | | | | | | | Merge branch '47679-fix-failed-jobs-tab-ie11' into 'master' | Phil Hughes | 2018-06-11 | 2 | -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ís | 2018-06-11 | 2 | -0/+10 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'gitlab-git-nlbr' into 'master' | Sean McGivern | 2018-06-11 | 22 | -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::Git | Jacob Vosmaer (GitLab) | 2018-06-11 | 22 | -47/+82 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'gitaly-commit-count-opt-out' into 'master' | Sean McGivern | 2018-06-11 | 3 | -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-out | Jacob Vosmaer (GitLab) | 2018-06-11 | 3 | -3/+8 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'rs-update-rspec' into 'master' | Rémy Coutable | 2018-06-11 | 45 | -94/+90 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update rspec to 3.7 See merge request gitlab-org/gitlab-ce!19449 | ||||
| | * | | | | | | | Correct more usages of non-relative `fixture_file_upload` paths | Robert Speicher | 2018-06-07 | 8 | -19/+13 |
| | | | | | | | | | |||||
| | * | | | | | | | Make all uses of `fixture_file_upload` use relative paths | Robert Speicher | 2018-06-07 | 37 | -58/+60 |
| | | | | | | | | | |||||
| | * | | | | | | | Update rspec to 3.7 | Robert Speicher | 2018-06-07 | 2 | -18/+18 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'rails5-enum-nil' into 'master' | Sean McGivern | 2018-06-11 | 3 | -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 enums | Jan Provaznik | 2018-06-06 | 3 | -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 Hughes | 2018-06-11 | 1 | -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 Lacerda | 2018-06-08 | 1 | -6/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of aria attributes | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |