summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fix user_browses_commits_spec29278-commits-page-tooltipsLuke Bennett2018-07-201-1/+0
|
* Add has_tooltip false to remaining commit realted usesLuke Bennett2018-07-202-2/+2
|
* Remove unneeded has_tooltip from commit_author_link useLuke Bennett2018-07-201-1/+1
|
* Remove all tooltip use from commit_person_linkLuke Bennett2018-07-201-5/+0
|
* Keep img title attrLuke Bennett2018-07-201-2/+2
|
* fix lintLuke Bennett2018-07-201-1/+2
|
* Added changelog entryLuke Bennett2018-07-171-0/+5
|
* Add has_tooltip bool handling for commit_person_linkLuke Bennett2018-07-171-5/+8
|
* Dont add title attr to user_avatar_without_link if has_tooltip is falseLuke Bennett2018-07-171-2/+2
|
* set has_tooltip to false for commit author_avatarLuke Bennett2018-07-171-2/+2
|
* Merge branch 'person-tags-better' into 'master'Annabel Gray2018-07-172-7/+3
|\ | | | | | | | | Highlighting of person mentions now better visible on low contrast screens and… See merge request gitlab-org/gitlab-ce!20509
| * Highlighting of person mentions now better visible on low contrast screens ↵Dimitrie Hoekstra2018-07-172-7/+3
|/ | | | and…
* Merge branch 'zj-remove-sanitize-repo-path' into 'master'Sean McGivern2018-07-173-42/+1
|\ | | | | | | | | | | | | Remove sanitize_repo_path Closes gitaly#1235 See merge request gitlab-org/gitlab-ce!20666
| * Remove sanitize_repo_pathZeger-Jan van de Weg2018-07-173-42/+1
| | | | | | | | | | | | | | This method is unneeded given its been pushed to Gitaly, through https://gitlab.com/gitlab-org/gitaly/merge_requests/780 Closes https://gitlab.com/gitlab-org/gitaly/issues/1235
* | Merge branch 'qa-48464-add-edit-delete-file-scenario' into 'master'44127-board-label-edit-drop-down-is-showing-incorrect-selected-labels-summaryRémy Coutable2018-07-178-2/+197
|\ \ | | | | | | | | | | | | QA scenario to add/edit/delete a file via the Web UI See merge request gitlab-org/gitlab-ce!20265
| * | QA scenario to add/edit/delete a file via the Web UISanad Liaquat2018-07-178-2/+197
|/ /
* | Merge branch 'docs-merge-templates-updates' into 'master'Rémy Coutable2018-07-172-18/+18
|\ \ | | | | | | | | | | | | Merge Templates updates See merge request gitlab-org/gitlab-ce!20585
| * | Merge Templates updatesMarcel Amirault2018-07-172-18/+18
|/ /
* | Merge branch 'close-revert-and-cherry-pick-modal-on-escape-keypress' into ↵Rémy Coutable2018-07-175-5/+53
|\ \ | |/ |/| | | | | | | | | 'master' Close revert and cherry pick modal on escape keypress See merge request gitlab-org/gitlab-ce!20341
| * Merge cherry-pick modal specsGeorge Tsiolis2018-07-173-28/+21
| |
| * Add spec for closing cherry-pick modal on escape keypressGeorge Tsiolis2018-07-174-4/+34
| |
| * Add spec for closing revert modal on escape keypressGeorge Tsiolis2018-07-171-0/+25
| |
| * Close revert and cherry-pick modal on escape keypressGeorge Tsiolis2018-07-171-1/+1
| |
* | Merge branch 'ab-docs-find-or-create' into 'master'Yorick Peterse2018-07-171-0/+42
|\ \ | | | | | | | | | | | | Document pattern for .find_or_create and siblings See merge request gitlab-org/gitlab-ce!20649
| * | Document pattern for .find_or_create and similar methods.ab-docs-find-or-createAndreas Brandl2018-07-171-0/+42
| | |
* | | Merge branch 'dz-improve-manifest-doc' into 'master'Douwe Maan2018-07-171-1/+2
|\ \ \ | | | | | | | | | | | | | | | | Add small improvement to Manifest import feature docs See merge request gitlab-org/gitlab-ce!20637
| * | | Add small improvement to Manifest import feature docsdz-improve-manifest-docDmitriy Zaporozhets2018-07-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Add link to manifest used by AOSP 2. Mention both Android and AOSP keyword for better search Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'move-danger-to-test-stage' into 'master'Sean McGivern2018-07-173-30/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Danger to test stage Closes #49185 See merge request gitlab-org/gitlab-ce!20654
| * | | | Improve danger/specs/Dangerfile by not requiring new specs if specific ↵move-danger-to-test-stageRémy Coutable2018-07-171-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | labels are applied Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Improve danger/changelog/Dangerfile to include the title in the ↵Rémy Coutable2018-07-171-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bin/changelog command Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Move the 'danger-review' job to the test stage and allow it to failRémy Coutable2018-07-171-19/+21
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'gitaly-issue-cross-reference' into 'master'Sean McGivern2018-07-171-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add cross-link to N+1 issue See merge request gitlab-org/gitlab-ce!20663
| * | | | | Add cross-link to N+1 issueJacob Vosmaer2018-07-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci-skip]
* | | | | | Merge branch '14995-custom_wiki_sidebar' into 'master'Sean McGivern2018-07-177-8/+88
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement customized sidebar Closes #14995 See merge request gitlab-org/gitlab-ce!17940
| * | | | | So we still want to have More Pages buttonLin Jen-Shin2018-07-171-1/+1
| | | | | |
| * | | | | Merge remote-tracking branch 'upstream/master' into 14995-custom_wiki_sidebarLin Jen-Shin2018-07-16107-1711/+1678
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (53 commits) Fix invalid link to GitLab.com architecture.md i18n: externalize strings from 'app/views/import' Remove Repository#lookup and unreachable rugged code refactor code based on feedback Trigger rails5 tests either by variable or ref name Fix link in help doc which was linking to old mono-repo, now in its own repo Allow Danger step to fail update webpack to v4.16 Backport logger changes from EE Add the CI Job trigger as the build trigger Remove flaky and redundant expectations use fileuploader dynamic path method in uploads manager and add spec fix typo in uploads manager add small comment to download method in uploads manager refactor uploads manager Update 10.6-to-10.7.md Lazy-load performance bar UI Update .gitlab-ci.yml fixed test to correctly text relative URLs doesnt add query param if source & target projects match Add changelog entry ...
| * | | | | | Always show More PagesLin Jen-Shin2018-07-131-4/+3
| | | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into 14995-custom_wiki_sidebarLin Jen-Shin2018-07-131739-32484/+57035
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (467 commits) Update docs board features tier Upgrade grape-path-helpers to 1.0.6 Remove healthchecks from prometheus endpoint Fix find_branch call sites Ensure Encoding.default_external is set to UTF-8 when running QA scenarios i18n: externalize strings from 'app/views/admin/groups' Backport mr widget changes from EE Allow to toggle notifications for issues due soon Vuex test helper improvements whitespace Make more ref RPC's mandatory Resolve "Improve performance of MR Changes tab: reduce event listeners on scroll event" Remove old service architecture from Vue docs Adding spec to test basic forking functionalities Fix performance problem of accessing tag list for projects api endpoints typo Add sleep to QA test before installing tiller Include Vue files that are not covered by tests in test coverage Remove Repository#path memoization Resolve "do not set updated_at when creating note" ...
| * \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Andreas Kämmerle2018-07-02448-4894/+7933
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 14995-custom_wiki_sidebar
| * | | | | | | | There's no point to test customized sidebar with empty wikiLin Jen-Shin2018-06-271-10/+0
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into 14995-custom_wiki_sidebarLin Jen-Shin2018-06-275423-90542/+176719
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (4180 commits) Enable frozen string literals for app/workers/*.rb Resolve "Search dropdown hides & shows when typing" Revert merge request widget button max height Update CHANGELOG.md for 11.0.2 Update external link icon in header user dropdown Added Diff Viewer to new VUE based MR page Fixed eslint failure in IDE spec helpers Use refs instead of querySelector. Show file in tree on WebIDE open Resolve "Remove unused bootstrap component CSS" Resolve "Explain what Groups are in the New Group page" [QA] Make sure we wait for the deploy key list to load Update _scopes_form.html.haml to remove duplicate information Use the branch instead of the tag to install port the EE changes Add index on deployable_type/id for deployments Add a helper to rename a column using a background migration Fix performance bottleneck when rendering large wiki pages Port Namespace#root_ancestor to CE Remove duplicate spec ...
| * | | | | | | | | Introduce #find_sidebar and use a constant to find the page14995-custom_wiki_sidebarLin Jen-Shin2018-03-263-1/+24
| | | | | | | | | |
| * | | | | | | | | Add some simple docs about _sidebar for wikiLin Jen-Shin2018-03-261-0/+7
| | | | | | | | | |
| * | | | | | | | | Rearrange the tests and add another case whereLin Jen-Shin2018-03-261-15/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it would still render the sidebar whenever the wiki is empty.
| * | | | | | | | | Avoid loading default sidebar if there's a customized oneLin Jen-Shin2018-03-261-2/+5
| | | | | | | | | |
| * | | | | | | | | Add test for sidebar and cleanup wiki testsLin Jen-Shin2018-03-231-3/+38
| | | | | | | | | |
| * | | | | | | | | Added support for custom wiki sidebar using _sidebar.md in the wiki root. If ↵Joshua Sooter2018-03-233-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _sidebar.md exists it will be parsed and rendered otherwise the default sidebar file list will display deleted _sidebar_custom.html.haml and modified _sidebar.html.haml to check for sidebar_page and render it or the default wiki page list. Also removed white space. fix indent in show.html.haml restore newline at end of ile Add a newline at the end of changelogs/custom_wiki_sidebar.yml
* | | | | | | | | | Merge branch 'gitaly-mandatory-20180716-jv' into 'master'Sean McGivern2018-07-172-73/+12
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate merge base, merged branches, write ref Closes gitaly#748, gitaly#695, and gitaly#799 See merge request gitlab-org/gitlab-ce!20639
| * | | | | | | | | | Migrate merge base, merged branches, write refJacob Vosmaer (GitLab)2018-07-172-73/+12
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'feature/gb/email-delivery-metrics' into 'master'Sean McGivern2018-07-1716-36/+132
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add emails delivery metrics Closes #49214 See merge request gitlab-org/gitlab-ce!20638