summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | Pipelines tabsFilipa Lacerda2016-11-305-5/+140
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'right-sidebar-fixture' into 'master' Fatih Acet2016-12-013-25/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace static fixture for right_sidebar_spec ## What does this MR do? Replace `right_sidebar.html.haml` for `right_sidebar_spec.js` by already existing dynamically generated fixture. ## What are the relevant issue numbers? #24753 See merge request !7687
| * | | | | | | | | | | Replace static fixture for right_sidebar_spec (!7687)winniehell2016-11-283-25/+10
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '22781-user-generated-permalinks' into 'master' Fatih Acet2016-12-019-93/+61
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "User-generated permalink IDs collide with GitLab interface" ## What does this MR do? Prevents ID values automatically generated by headers in [GitLab Flavored Markdown](https://github.com/gitlabhq/gitlabhq/blob/master/doc/user/markdown.md#header-ids-and-links) from colliding with IDs used elsewhere in the GitLab interface. This can cause confusion when, for instance, a selector looks for a merge request tab with `id="pipelines"` and there is a header with the same ID earlier in the DOM. How this works: * All header IDs generated with GitLab Flavored Markdown are namespaced with `id="user-content_foo"` * All anchor links which point to these IDs continue to use the non-namespaced hash `<a href="#foo">...</a>` * When a page is loaded or when the `hashchange` event is triggered, javascript will automatically search for `#user-content_foo` if `#foo` cannot be found, and scroll to that position instead. ## Before ![2016-11-21-13.00.28](/uploads/e3be2cd6a9142dfd6e64db5462a6aa76/2016-11-21-13.00.28.gif) ## After: ![2016-11-21-13.12.45](/uploads/f7ae3f3a30c91325eaa3665591b6a850/2016-11-21-13.12.45.gif) ![2016-11-21-13.03.00](/uploads/3a6a782c081ecaa05b8781548d794909/2016-11-21-13.03.00.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22781 See also prior attempts to address this issue: #3908, !2023, !2024 See merge request !7631
| * | | | | | | | | | | remove underscore from user-content id namespace22781-user-generated-permalinksMike Greiling2016-11-305-9/+9
| | | | | | | | | | | |
| * | | | | | | | | | | remove setTimeout wrapper for location hash correctionMike Greiling2016-11-301-3/+1
| | | | | | | | | | | |
| * | | | | | | | | | | prevent anchor tag outline on :focus or :target pseudo-classMike Greiling2016-11-301-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | update gitlab flavored markdown tests to reflect namespaced idsMike Greiling2016-11-303-12/+17
| | | | | | | | | | | |
| * | | | | | | | | | | remove id collision caveat from documentationMike Greiling2016-11-301-48/+0
| | | | | | | | | | | |
| * | | | | | | | | | | add CHANGELOG entry for !7631Mike Greiling2016-11-301-0/+4
| | | | | | | | | | | |
| * | | | | | | | | | | add transparent namespace to all user-generated anchors in GitLab flavored ↵Mike Greiling2016-11-302-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | markdown
| * | | | | | | | | | | remove duplicate functionality (bad merge conflict resolution?)Mike Greiling2016-11-302-28/+19
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch ↵Fatih Acet2016-12-018-72/+64
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '24281-issue-merge-request-sidebar-subscribe-button-style-improvement' into 'master' Remove the help text under the sidebar subscribe button and style it inline ## What does this MR do? Remove the help text under the sidebar subscribe button and style it inline ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Current help text is over obvious and pushes references too far down. Also the subscribe button is now consistently styled and not a complete block button anymore. approved by @awhildy ## Screenshots (if relevant) before: ![image](/uploads/0c9543d2bf184a73b65773caa5f9fc62/image.png) after: ![image](/uploads/765338823376267427f4a16737e39998/image.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24281 See merge request !7389
| * | | | | | | | | | | | remove selector string option from Subscription constructor24281-issue-merge-request-sidebar-subscribe-button-style-improvementMike Greiling2016-12-011-5/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | use HTMLElement.dataset over getAttribute since all browsers GitLab supports ↵Mike Greiling2016-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implement it
| * | | | | | | | | | | | remove tooltip logicMike Greiling2016-11-301-7/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | satisfy eslint no-param-reassign and remove rule exceptionMike Greiling2016-11-301-4/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | add comma to satisfy eslint comma-dangleMike Greiling2016-11-301-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | use less error-prone lowercase comparison for isSubscribedMike Greiling2016-11-301-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | move eslint rules to top of scriptMike Greiling2016-11-301-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | rewrite subscription javascript to accomodate new designMike Greiling2016-11-306-59/+60
| | | | | | | | | | | | |
| * | | | | | | | | | | | rename subscription.js to subscription.js.es6Mike Greiling2016-11-301-0/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | Remove the help text under the sidebar subscribe button and style it inlineDimitrie Hoekstra2016-11-302-7/+6
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch '25198-improper-use-of-bootstrap-media-query-variables' into ↵Annabel Dunstone Gray2016-12-0115-22/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Improper use of bootstrap media query variables" ## What does this MR do? Corrects media queries which are off by `1px` due to incorrect `$screen-{xs,sm,md,lg}-min` usage. ## Are there points in the code the reviewer needs to double check? Ensure none of these errors were somehow intentional (I can't imagine a legitimate use case for `@media (max-width: $screen-sm-min)` though) ## Why was this MR needed? When "min" breakpoints are used for "max-width" media queries, they create an overlap in rule breakpoints. For instance in the following scenario: ```scss .foo { @media (min-width: $screen-sm-min) { width: 100px; padding: 0; } @media (max-width: $screen-sm-min) { padding: 10px 0; } } ``` If the viewport were set to exactly `$screen-sm-min` pixels, both of these media queries would apply. It is important to use `max-width: $screen-xs-max` in this case which is equal to `$screen-sm-min - 1`. ## Does this MR meet the acceptance criteria? - [ ] ~~[Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added~~ - [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [ ] ~~API support added~~ - Tests - [ ] ~~Added for this feature/bug~~ - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25198 See merge request !7863
| * | | | | | | | | | | | fix incorrect min-width media queries25198-improper-use-of-bootstrap-media-query-variablesMike Greiling2016-11-302-3/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | fix incorrect max-width media queriesMike Greiling2016-11-3014-20/+20
| |/ / / / / / / / / / /
* | | | | | | | | | | | Update CHANGELOG.md for 8.14.2Alejandro Rodríguez2016-12-0118-68/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | Merge branch '18546-update-wiki-page-design' into 'master' Fatih Acet2016-12-0122-135/+334
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "missing design for wiki page" ### To Do: - [x] Move page navigation from sub-menu to sidebar menu - [x] Update wiki page header - [x] Update wiki edit page actions and header - [x] Update `Git access` page design - [ ] ~~Add search to sidebar navigation~~ ### Screen Shots: #### `@media (min-width: $screen-lg)` ![Screen_Shot_2016-11-16_at_12.25.47_PM](/uploads/2efc59639ac53d69808e78a8ba65fcbf/Screen_Shot_2016-11-16_at_12.25.47_PM.png) ![Screen_Shot_2016-11-16_at_12.25.36_PM](/uploads/bb7e93558335edf4216082cc1ac3f8f5/Screen_Shot_2016-11-16_at_12.25.36_PM.png) ![Screen_Shot_2016-11-16_at_12.26.43_PM](/uploads/c2dce7cff05680b9a03438ec7d9967b4/Screen_Shot_2016-11-16_at_12.26.43_PM.png) ![Screen_Shot_2016-11-16_at_12.26.05_PM](/uploads/7dbae25bfc93fb2f01cd231db0cb47d3/Screen_Shot_2016-11-16_at_12.26.05_PM.png) #### `@media (min-width: $screen-md)` ![Screen_Shot_2016-11-16_at_12.28.18_PM](/uploads/4fdcc8c88c38093ea5a4fe0b22b79acf/Screen_Shot_2016-11-16_at_12.28.18_PM.png) ![Screen_Shot_2016-11-16_at_12.28.21_PM](/uploads/ce84a51fdc0623b2b192d8334c2c2f6d/Screen_Shot_2016-11-16_at_12.28.21_PM.png) #### `@media (min-width: $screen-sm)` ![Screen_Shot_2016-11-16_at_12.28.05_PM](/uploads/cf612a36259c248ca597a0850546fe75/Screen_Shot_2016-11-16_at_12.28.05_PM.png) ![Screen_Shot_2016-11-16_at_12.28.08_PM](/uploads/ae4374f9968c1cc064242fde3ad0e214/Screen_Shot_2016-11-16_at_12.28.08_PM.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #18546 See merge request !7429
| * | | | | | | | | | | rename event variable to just e18546-update-wiki-page-designMike Greiling2016-11-301-4/+4
| | | | | | | | | | | |
| * | | | | | | | | | | fix media query off-by-1 pixel errorMike Greiling2016-11-301-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | add special class in cases where sidebar toggle should exist in the marginMike Greiling2016-11-305-6/+10
| | | | | | | | | | | |
| * | | | | | | | | | | prevent nav control buttons from wrapping awkwardly when they overflowMike Greiling2016-11-301-0/+6
| | | | | | | | | | | |
| * | | | | | | | | | | echo changes in 6683fdcf for wiki pages pathMike Greiling2016-11-301-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | add CHANGELOG entry for !7429Mike Greiling2016-11-301-0/+4
| | | | | | | | | | | |
| * | | | | | | | | | | use wiki pages index for sidebar overflow and limit sidebar list to 15 pagesMike Greiling2016-11-305-6/+12
| | | | | | | | | | | |
| * | | | | | | | | | | prevent sidebar toggle from overlapping git access header on mobileMike Greiling2016-11-301-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | fix tests broken by new wiki page designMike Greiling2016-11-306-28/+19
| | | | | | | | | | | |
| * | | | | | | | | | | update wiki pages with new designMike Greiling2016-11-306-44/+64
| | | | | | | | | | | |
| * | | | | | | | | | | add wiki page list to sidebarMike Greiling2016-11-301-5/+4
| | | | | | | | | | | |
| * | | | | | | | | | | allow wiki sidebar to scroll on overflowMike Greiling2016-11-301-0/+2
| | | | | | | | | | | |
| * | | | | | | | | | | update design of wiki git access pageMike Greiling2016-11-302-32/+54
| | | | | | | | | | | |
| * | | | | | | | | | | add active states to sidebar navMike Greiling2016-11-302-4/+13
| | | | | | | | | | | |
| * | | | | | | | | | | move wiki navbar content to right sidebarMike Greiling2016-11-3013-63/+199
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'fix/github-importer' into 'master' Sean McGivern2016-12-013-4/+14
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix GitHub importer to import PR where source repo/fork was renamed/deleted Closes #24594 See merge request !7865
| * | | | | | | | | | Add CHANGELOG entryfix/github-importerDouglas Barbosa Alexandre2016-12-011-0/+4
| | | | | | | | | | |
| * | | | | | | | | | Fix branch validation for GitHub PR where repo/fork was renamed/deletedDouglas Barbosa Alexandre2016-12-012-4/+10
| |/ / / / / / / / /
* | | | | | | | | | Merge branch '25199-fix-broken-urls-in-help-page' into 'master' Sean McGivern2016-12-014-13/+34
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix URL rewritting in the Help section Closes #25199 See merge request !7875
| * | | | | | | | | | Fix URL rewritting in the Help section25199-fix-broken-urls-in-help-pageRémy Coutable2016-12-014-13/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | Merge branch 'shortcuts-issuable-fixture' into 'master' Alfredo Sumaran2016-12-013-4/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace static fixture for shortcuts_issuable_spec ## What does this MR do? Replace `issuable.html.haml` for `shortcuts_issuable_spec.js` by already existing dynamically generated fixture. ## What are the relevant issue numbers? #24753 See merge request !7685
| * | | | | | | | | | | Replace static fixture for shortcuts_issuable_spec (!7685)winniehell2016-11-233-4/+8
| | | | | | | | | | | |