summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | 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
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'fix-optimistic-locking-for-destroy' into 'master' Stan Hu2016-12-012-7/+40
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make deleting with optimistic locking respect NULL Make deleting with optimistic locking respect NULL For now deleting with optimistic locking is broken when lock_version is still NULL, because Rails would try to delete with `lock_version = 0` while in the database the column is still `NULL`. The monkey patches would force Rails just pass whatever in the column, and stop Rails from casting `NULL` into `0` when the value is read from database. Closes #24766 See merge request !7867
| * | | | | | | | | | | Use Arel to avoid MySQL triple quotingfix-optimistic-locking-for-destroyLin Jen-Shin2016-12-011-2/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Make deleting with optimistic locking respect NULLLin Jen-Shin2016-12-012-7/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now deleting with optimistic locking is broken when lock_version is still NULL, because Rails would try to delete with `lock_version = 0` while in the database the column is still `NULL`. The monkey patches would force Rails just pass whatever in the column, and stop Rails from casting `NULL` into `0` when the value is read from database. Closes #24766
* | | | | | | | | | | | Merge branch ↵Yorick Peterse2016-12-016-12/+40
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '24669-merge-request-dashboard-page-takes-over-a-minute-to-load' into 'master' Resolve "Merge request dashboard page takes over a minute to load" See merge request !7760
| * | | | | | | | | | | | Fix have_issuable_counts matcher on failure24669-merge-request-dashboard-page-takes-over-a-minute-to-loadSean McGivern2016-12-011-4/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Don't include ignored params in cache keySean McGivern2016-12-011-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add changelog entrySean McGivern2016-12-011-0/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Count all issuable states at onceSean McGivern2016-12-012-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of doing n queries for n states, do one query to get all the counts grouped by state, and figure out what the count is for each state is from that. We can still cache the individual counts (it can't hurt), but this will help with initial load. Note that the `opened` scope on `Issuable` includes the `opened` and `reopened` states, which is why there's a special case.
| * | | | | | | | | | | | Save a query on issue and MR listsSean McGivern2016-12-012-2/+2
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `any?` on an AR relation performs a `SELECT COUNT`, which we don't need. 1. We are very likely to have issues or MRs, so the `SELECT COUNT` is often unnecessary. 2. Even where there are no items returned, the overhead of the `SELECT *` instead of `SELECT COUNT` is relatively small. Calling `to_a` on the relation lets us use `Enumerable#any?`, which will return immediately if there are objects returned.
* | | | | | | | | | | | Merge branch 'rescue-from-redis-init-errors' into 'master' Stan Hu2016-12-012-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gracefully recover from Redis connection failures in Sidekiq initializer Precompiling assets and other Rake tasks would fail if Redis were not available in certain cases. * Closes gitlab-org/gitlab-ce#25143 * Closes gitlab-org/omnibus-gitlab#1743 See merge request !7835
| * | | | | | | | | | | | Gracefully recover from Redis connection failures in Sidekiq initializerStan Hu2016-12-012-1/+5
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Closes gitlab-org/gitlab-ce#25143 * Closes gitlab-org/omnibus-gitlab#1743
* | | | | | | | | | | | Merge branch 'use-st-commits-where-possible' into 'master' Yorick Peterse2016-12-0111-44/+73
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace references to MergeRequestDiff#commits with st_commits when we care only about the number of commits See merge request !7668
| * | | | | | | | | | | Replace references to MergeRequestDiff#commits with st_commitsuse-st-commits-where-possibleAdam Niedzielski2016-12-0111-44/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when we care only about the number of commits We do not have to instantiate all objects in this case.
* | | | | | | | | | | | Merge branch 'docs/container-registry-2fa' into 'master' Achilleas Pipinellis2016-12-013-21/+43
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the need to use a PAT with Registry when 2FA is on Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22465 See merge request !7874
| * | | | | | | | | | | Document the need to use a PAT with Registry when 2FA is onAchilleas Pipinellis2016-12-013-21/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab 8.12 introduced a new permissions model which tightened the security of Container Registry. It is now required to use a personal token if 2FA is enabled. [ci skip]
* | | | | | | | | | | | Merge branch 'docs/fix-webhooks-headings' into 'master' Achilleas Pipinellis2016-12-012-35/+46
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Small refactor of webhooks docs See merge request !7872
| * | | | | | | | | | | Small refactor of webhooks docsAchilleas Pipinellis2016-12-012-35/+46
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | Merge branch 'docs/triggers-ref-clarify' into 'master' Achilleas Pipinellis2016-12-011-3/+7
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify that a commit SHA doesn't work for CI triggers Related https://gitlab.com/gitlab-org/gitlab-ce/issues/22029 See merge request !7871
| * | | | | | | | | | | Clarify that a commit SHA doesn't work for CI triggersAchilleas Pipinellis2016-12-011-3/+7
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]