Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add docs for linking in changed pages from MR widgetdocs/direct-link-review-apps | Achilleas Pipinellis | 2018-11-16 | 3 | -8/+26 |
| | |||||
* | Merge branch 'discussion-perf-improvement' into 'master' | Filipa Lacerda | 2018-11-12 | 9 | -23/+38 |
|\ | | | | | | | | | Improve initial rendering of discussion notes See merge request gitlab-org/gitlab-ce!22607 | ||||
| * | Consistently use Vue.nexTick when starting taskListdiscussion-perf-improvement | Phil Hughes | 2018-11-09 | 1 | -8/+11 |
| | | |||||
| * | Fixed failing note actions spec | Phil Hughes | 2018-11-09 | 1 | -0/+3 |
| | | |||||
| * | Init task list when creating new note & discussion | Phil Hughes | 2018-11-09 | 2 | -0/+2 |
| | | |||||
| * | Fix TaskList init on update & poll | Phil Hughes | 2018-11-09 | 3 | -11/+10 |
| | | | | | | | | Fixed duplicate TaskList requests being made | ||||
| * | Improve initial rendering of discussion notes | Phil Hughes | 2018-11-09 | 5 | -13/+21 |
| | | | | | | | | | | | | This improves the initial rendering performance of notes by only creating a new TaskList for the whole app, rather than on a per-note component basis. | ||||
* | | Merge branch 'rails5-update-gemfile' into 'master' | Sean McGivern | 2018-11-12 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | Upgrade whitequark/parser to 2.5.3.0 See merge request gitlab-org/gitlab-ce!22984 | ||||
| * | | Upgrade whitequark/parser to 2.5.3.0 | Jan Provaznik | 2018-11-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Rails 5 counterpart to the version update from 7fb30b4cc4994022e55460e6905996212859cfb6 | ||||
* | | | Merge branch 'docs-dev-guidelines-update' into 'master' | Achilleas Pipinellis | 2018-11-12 | 3 | -319/+459 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Docs: updates docs development guidelines Closes #53160 and #53115 See merge request gitlab-org/gitlab-ce!22813 | ||||
| * | | | Docs: updates docs development guidelines | Marcia Ramos | 2018-11-12 | 3 | -319/+459 |
|/ / / | |||||
* | | | Merge branch 'docs/danger-documentation' into 'master' | Rémy Coutable | 2018-11-12 | 1 | -3/+26 |
|\ \ \ | | | | | | | | | | | | | | | | | Dangerbot: mention tech writers based on DevOps stage See merge request gitlab-org/gitlab-ce!22945 | ||||
| * | | | Proper markdown table in docs Dangerfile | Achilleas Pipinellis | 2018-11-12 | 1 | -14/+16 |
| | | | | |||||
| * | | | Edits to docs Dangerfiledocs/danger-documentation | Mike Lewis | 2018-11-09 | 1 | -10/+21 |
| | | | | |||||
| * | | | Dangerbot: mention tech writers based on DevOps stage | Achilleas Pipinellis | 2018-11-09 | 1 | -3/+13 |
| | | | | |||||
* | | | | Merge branch 'sh-bump-sidekiq' into 'master' | Sean McGivern | 2018-11-12 | 2 | -5/+5 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | Bump Sidekiq and other related gems See merge request gitlab-org/gitlab-ce!22956 | ||||
| * | | | Update gems in Gemfile.rails5.lock | Jan Provaznik | 2018-11-12 | 1 | -2/+2 |
| | | | | |||||
| * | | | Bump Sidekiq and other related gems | Stan Hu | 2018-11-09 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Sidekiq changes: https://github.com/mperham/sidekiq/blob/master/Changes.md * Rack 1.6.1 fixes CVE-2014-9490: https://github.com/rack/rack/blob/master/CHANGELOG.md * rack-protection 2.0.4 only fixes a minor message: https://github.com/sinatra/sinatra/commits/master/rack-protection | ||||
* | | | | Merge branch 'jprovazn-fix-status-spec' into 'master'qa-xss-in-mentions-test | Rémy Coutable | 2018-11-12 | 1 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ./spec/features/issues/user_views_issue_spec.rb Closes gitlab-ee#8390 See merge request gitlab-org/gitlab-ce!22976 | ||||
| * | | | | Fix transient rspec issue | Jan Provaznik | 2018-11-12 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI randomly fails with: ActiveRecord::RecordNotFound: Couldn't find Project with 'id'=724 This is probably caused by DB cleanup strategy used for :js tests in combination with `set`. | ||||
* | | | | | Merge branch 'blackst0ne-add-discord-service' into 'master' | Sean McGivern | 2018-11-12 | 15 | -242/+374 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Discord integration Closes #21635 See merge request gitlab-org/gitlab-ce!22684 | ||||
| * | | | | | Fix minor offensesblackst0ne-add-discord-service | blackst0ne | 2018-11-10 | 2 | -6/+2 |
| | | | | | | |||||
| * | | | | | Refactor specs | blackst0ne | 2018-11-07 | 4 | -469/+253 |
| | | | | | | |||||
| * | | | | | DRY specs, fix typos in docs | blackst0ne | 2018-11-06 | 5 | -45/+35 |
| | | | | | | |||||
| * | | | | | Update documentation after documentation review. | blackst0ne | 2018-11-05 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Updated docs and removed redundant screenshot | blackst0ne | 2018-11-05 | 2 | -2/+2 |
| | | | | | | |||||
| * | | | | | Update docs after docs review | blackst0ne | 2018-11-05 | 1 | -14/+13 |
| | | | | | | |||||
| * | | | | | Update Gemfile | blackst0ne | 2018-11-05 | 3 | -17/+7 |
| | | | | | | |||||
| * | | | | | Fix frozen strings | blackst0ne | 2018-11-05 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Update documentation | blackst0ne | 2018-11-05 | 3 | -0/+31 |
| | | | | | | |||||
| * | | | | | Add spec for DiscordService | blackst0ne | 2018-11-05 | 1 | -0/+242 |
| | | | | | | |||||
| * | | | | | Update discord notification service | blackst0ne | 2018-11-05 | 1 | -6/+4 |
| | | | | | | |||||
| * | | | | | Add changelog entry | blackst0ne | 2018-11-05 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | Add Discord integration | blackst0ne | 2018-10-30 | 9 | -0/+95 |
| | | | | | | |||||
* | | | | | | Merge branch 'disable-usage-ping-review-apps' into 'master' | Rémy Coutable | 2018-11-12 | 1 | -0/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable usage pings in review apps See merge request gitlab-org/gitlab-ce!22965 | ||||
| * | | | | | | Disable usage pings in review appsdisable-usage-ping-review-apps | Balasankar "Balu" C | 2018-11-11 | 1 | -0/+1 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch ↵ | Sean McGivern | 2018-11-12 | 3 | -5/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '53082-gitlab-ce-11-4-0-gemfile-conflict-gitlab-markup-and-github-markup' into 'master' Update gitlab-markup gem to avoid binary name collision Closes #53082 See merge request gitlab-org/gitlab-ce!22960 | ||||
| * | | | | | | Update gitlab-markup gem to avoid binary name collision53082-gitlab-ce-11-4-0-gemfile-conflict-gitlab-markup-and-github-markup | Alejandro Rodríguez | 2018-11-11 | 3 | -5/+5 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/53082 | ||||
* | | | | | | Merge branch 'docs/more-url-fixes' into 'master' | Dmitriy Zaporozhets | 2018-11-12 | 3 | -27/+23 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | Fix some links and Markdown See merge request gitlab-org/gitlab-ce!22972 | ||||
| * | | | | | Fix some links and Markdowndocs/more-url-fixes | Evan Read | 2018-11-12 | 3 | -27/+23 |
| | | | | | | |||||
* | | | | | | Merge branch 'docs/fix-more-urls' into 'master' | Achilleas Pipinellis | 2018-11-12 | 4 | -6/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update URLs to better ones See merge request gitlab-org/gitlab-ce!22931 | ||||
| * | | | | | | Implement review commentsdocs/fix-more-urls | Evan Read | 2018-11-12 | 2 | -4/+4 |
| | | | | | | | |||||
| * | | | | | | Update URLs to better ones | Evan Read | 2018-11-09 | 4 | -4/+4 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'docs/fix-helm-chart-issue-link' into 'master' | Achilleas Pipinellis | 2018-11-12 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | Fix link for raising helm chart issues See merge request gitlab-org/gitlab-ce!22970 | ||||
| * | | | | | | Fix link for raising helm chart issuesdocs/fix-helm-chart-issue-link | Evan Read | 2018-11-12 | 1 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'add-rbac-link-in-k8s-docs' into 'master' | Evan Read | 2018-11-12 | 1 | -3/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | Add link in K8s integration docs to RBAC roles See merge request gitlab-org/gitlab-ce!22941 | ||||
| * | | | | | | Add link in K8s integration docs to RBAC rolesadd-rbac-link-in-k8s-docs | Dylan Griffith | 2018-11-09 | 1 | -3/+4 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'docs-update-variable-naming' into 'master' | Evan Read | 2018-11-11 | 11 | -18/+18 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Update Variable naming See merge request gitlab-org/gitlab-ce!22352 | ||||
| * | | | | | | Docs: Update Variable naming | Marcel Amirault | 2018-11-11 | 11 | -18/+18 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'fix-error-handling-bugs-in-kubernetes-integration' into 'master' | Dmitriy Zaporozhets | 2018-11-11 | 4 | -3/+20 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | Fix error handling bugs in kubernetes integration See merge request gitlab-org/gitlab-ce!22922 |