summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge branch 'fix-404-for-pipelines' into 'master' Rémy Coutable2016-06-235-2/+273
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 404 for pipelines ## What does this MR do? Allow to access pipelines of public project by logged guest. ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17885 ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4881
| * | | | | | | Fix 404 when accessing pipelines as guest user on public projectsKamil Trzcinski2016-06-231-0/+1
| | | | | | | |
| * | | | | | | Fix 404 for pipelinesKamil Trzcinski2016-06-234-2/+272
| | | | | | | |
* | | | | | | | Merge branch '18915-pagination-with-priority-sort-repeats-results' into ↵Rémy Coutable2016-06-233-9/+27
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix pagination on sorts with lots of ties ## What does this MR do? Fixes #18915. As we only order by the sorted column, we don't have any tie-breaker. Some orderings, like priority and weight, have lots of ties, so you can see duplicate results as you page through. (Timestamp columns are less susceptible to this.) ## Are there points in the code the reviewer needs to double check? I just picked `id DESC`, this could as easily be `id ASC`. ## Why was this MR needed? Postgres and MySQL don't guarantee that pagination with `LIMIT` and `OFFSET` will work as expected if the ordering isn't unique. From the Postgres docs: > When using `LIMIT`, it is important to use an `ORDER BY` clause that > constrains the result rows into a unique order. Otherwise you will get > an unpredictable subset of the query's rows Before: [1] pry(main)> issues = 1.upto(Issue.count).map { |i| Issue.sort('priority').page(i).per(1).map(&:id) }.flatten [2] pry(main)> issues.count => 81 [3] pry(main)> issues.uniq.count => 42 After: [1] pry(main)> issues = 1.upto(Issue.count).map { |i| Issue.sort('priority').page(i).per(1).map(&:id) }.flatten [2] pry(main)> issues.count => 81 [3] pry(main)> issues.uniq.count => 81 See merge request !4878
| * | | | | | | | Fix pagination on sorts with lots of tiesSean McGivern2016-06-233-9/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Postgres and MySQL don't guarantee that pagination with `LIMIT` and `OFFSET` will work if the ordering isn't unique. From the Postgres docs: > When using `LIMIT`, it is important to use an `ORDER BY` clause that > constrains the result rows into a unique order. Otherwise you will get > an unpredictable subset of the query's rows Before: [1] pry(main)> issues = 1.upto(Issue.count).map { |i| Issue.sort('priority').page(i).per(1).map(&:id) }.flatten [2] pry(main)> issues.count => 81 [3] pry(main)> issues.uniq.count => 42 After: [1] pry(main)> issues = 1.upto(Issue.count).map { |i| Issue.sort('priority').page(i).per(1).map(&:id) }.flatten [2] pry(main)> issues.count => 81 [3] pry(main)> issues.uniq.count => 81
* | | | | | | | | Merge branch 'fix-clickable-code-search-results' into 'master' Robert Speicher2016-06-232-3/+5
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix clickable code search results Closes #17860 See merge request !4654
| * | | | | | | | renamed path to linkbarthc2016-06-232-5/+5
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into fix-clickable-code-search-resultsbarthc2016-06-23723-4209/+27256
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | fix clickable code search resultsbarthc2016-06-142-3/+5
| | | | | | | | |
* | | | | | | | | Merge branch 'migration_guide_remove_rubocop' into 'master' Robert Speicher2016-06-231-1/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Rubocop skip comment from migration style guide This was an error in previous MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4693 [ci skip] See merge request !4879
| * | | | | | | | | Remove Rubocop skip comment from migration style guide [ci skip]Drew Blessing2016-06-231-1/+0
| | | | | | | | | |
* | | | | | | | | | Merge branch 'fix/import-export-gitlab-errors' into 'master' Rémy Coutable2016-06-235-1/+48
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix errors found on importing GitLab CE repo Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18968 See merge request !4855
| * | | | | | | | | added changelogfix/import-export-gitlab-errorsJames Lopez2016-06-231-0/+3
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-06-231-45/+57
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | fix/import-export-gitlab-errors
| * | | | | | | | | fixed pipeline notes issueJames Lopez2016-06-233-0/+42
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-06-2378-129/+808
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/import-export-gitlab-errors
| * | | | | | | | | | fix utc errorJames Lopez2016-06-221-1/+3
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'update-influx-docs-management-repo' into 'master' Achilleas Pipinellis2016-06-231-68/+18
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use influxdb-management for managing InfluxDB ## What does this MR do? This updates the InfluxDB documentation so it suggests using https://gitlab.com/gitlab-org/influxdb-management instead of requiring users to manually copy-paste queries into an InfluxDB shell. ## Are there points in the code the reviewer needs to double check? Mostly spelling and if the writing style makes sense. ## Why was this MR needed? The same list of queries was duplicated in multiple places and it was hard to manually keep this up to date. ## Does this MR meet the acceptance criteria? - [x] ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~ Not really tied into a version - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] 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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4875
| * | | | | | | | | | Use influxdb-management for managing InfluxDBupdate-influx-docs-management-repoYorick Peterse2016-06-231-68/+18
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the need for manually updating the list of queries every time we make a change. [ci skip]
* | | | | | | | | | Merge branch '18663-sidekiq-latency-instrumentation' into 'master' Yorick Peterse2016-06-233-1/+19
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Sidekiq job latency to transaction metrics. See merge request !4871
| * | | | | | | | | Add Sidekiq queue duration to transaction metrics.Paco Guzman2016-06-233-1/+19
| | | | | | | | | |
* | | | | | | | | | Merge branch 'update-influx-continuous-queries' into 'master' Yorick Peterse2016-06-231-45/+57
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated InfluxDB continuous queries for 8.9.0 See merge request !4872
| * | | | | | | | | Updated InfluxDB continuous queries for 8.9.0Yorick Peterse2016-06-231-45/+57
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge branch '18857-new-label-page-needs-work-on-mobile' into 'master' Jacob Schatz2016-06-231-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added bottom padding to label color suggestion link ## What does this MR do? Adds a bottom margin to label color suggestions to make sure that when wrapped there is enough whitespace between color rows. ## Are there points in the code the reviewer needs to double check? :confused: ## Why was this MR needed? Mobile UX. ## What are the relevant issue numbers? Closes #18857. ## Screenshots (if relevant) ![Screen_Shot_2016-06-22_at_00.31.26](/uploads/f49c7fa2b97b13e69f0dea97c5dfb319/Screen_Shot_2016-06-22_at_00.31.26.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4845
| * | | | | | | | Added bottom padding to label color suggestion link18857-new-label-page-needs-work-on-mobileLuke "Jared" Bennett2016-06-221-0/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'fix-header-logo' into 'master' Jacob Schatz2016-06-231-0/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restrict header logo to 36px so it doesn't overflow. ## What does this MR do? Fixes the logo in the header. ## Are there points in the code the reviewer needs to double check? I don't think so. ## Why was this MR needed? Logos that weren't 36px by 36px were broken in 8.9.0 ## What are the relevant issue numbers? Fixes #18980 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-06-22_at_1.52.54_PM](/uploads/de6e4d9ccf40b972565e3864173a9907/Screen_Shot_2016-06-22_at_1.52.54_PM.png) After: ![Screen_Shot_2016-06-22_at_1.52.37_PM](/uploads/d72e015263888b5155c1db5e25f54d66/Screen_Shot_2016-06-22_at_1.52.37_PM.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) cc: @jschatz1 @dzaporozhets @rspeicher See merge request !4861
| * | | | | | | | | Fix header logo width/height issuesJacob Schatz2016-06-231-1/+0
| | | | | | | | | |
| * | | | | | | | | Restrict header logo to 36px so it doesn't overflow.fix-header-logoConnor Shea2016-06-221-0/+5
| | | | | | | | | |
* | | | | | | | | | Merge branch 'ruby-23-cache' into 'master' Robert Speicher2016-06-221-0/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add caching for Ruby 2.3 tests. Accidentally removed when !3807 was merged. See merge request !4868
| * | | | | | | | | | Add caching for Ruby 2.3 tests.Connor Shea2016-06-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accidentally removed when !3807 was merged.
* | | | | | | | | | | Merge branch 'sri' into 'master' Robert Speicher2016-06-222-3/+7
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Subresource Integrity attribute to CSS and JS assets. This prevents compromised or malicious CDNs from modifying GitLab's assets. The hash provided by Rails is compared to the hash of the asset the browser has downloaded. The browser will refuse to execute/parse the assets if the hashes don't match. SRI is currently implemented in Firefox, Chrome, and Opera. This doesn't apply to the dynamically-generated per-page JavaScript due to [a bug in sprockets-rails](https://github.com/rails/sprockets-rails/issues/359). Unfortunately until there's a fix available we won't benefit fully from a security perspective. It's more secure. More information is available in #18230 and on MDN: https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity Fixes #18230 See merge request !4808
| * | | | | | | | | | Add clarifying comment and a Changelog entry.Connor Shea2016-06-222-0/+4
| | | | | | | | | | |
| * | | | | | | | | | Add Subresource Integrity attribute to CSS and JS assets.Connor Shea2016-06-221-3/+3
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents compromised or malicious CDNs from modifying assets. The hash provided by Rails is compared to the hash of the asset the browser has downloaded. The browser will refuse to execute/parse the assets if the hashes don't match. SRI is currently implemented in Firefox, Chrome, and Opera. More information is available in #18230 and on MDN: https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity This doesn't apply to the dynamically-generated per-page JavaScript due to a bug in sprockets-rails (https://github.com/rails/sprockets-rails/issues/359).
* | | | | | | | | | Merge branch 'fix_saml_signin' into 'master' Robert Speicher2016-06-222-2/+18
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix subsequent SAML sign ins Fixes a bug when `auto_link_ldap_user` is `true` that causes SAML users to be unable to sign in a second time. Fix the problem for https://gitlab.zendesk.com/agent/tickets/22546 See merge request !4718
| * | | | | | | | | Fix subsequent SAML sign insDrew Blessing2016-06-222-2/+18
| | | | | | | | | |
* | | | | | | | | | Merge branch 'fix-external-issue-links' into 'master' Robert Speicher2016-06-222-3/+43
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle external issues in IssueReferenceFilter Handling of external issues was broken when I refactored `IssueReferenceFilter` to use fewer SQL queries. Fixes #18827 See merge request !4789
| * | | | | | | | | | Handle external issues in IssueReferenceFilterfix-external-issue-linksYorick Peterse2016-06-212-3/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the past this class would use Project#get_issue to retrieve an issue by its ID. This method would automatically determine whether to return an Issue or ExternalIssue. This commit changes IssueReferenceFilter to handle external issues again and in a somewhat more explicit manner than before. Fixes gitlab-org/gitlab-ce#18827
* | | | | | | | | | | Merge branch 'fix_upgrade_docs' into 'master' Drew Blessing2016-06-2222-22/+273
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update docs based on customer upgrade from 4.0 ## What does this MR do? Adds helpful notes to early upgrade docs. Without these helpful hints it will be really hard for most people to upgrade from early versions to later versions. The tip about doing database migrations to version 6.1, then migrating iids, then migrating the database all the way was based on a tip from https://github.com/gitlabhq/gitlabhq/issues/7869. It worked really well! See merge request !4409
| * | | | | | | | | | Update docs based on customer upgrade from 4.0 [ci skip]Drew Blessing2016-06-2222-22/+273
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'inline-todos-docs' into 'master' Robert Speicher2016-06-225-21/+38
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Todos documentation and screenshots to include new functionality. Updates documentation for todos, includes updated and new screenshots. See also !4502 and #18906 Closes #18923 [ci skip] See merge request !4840
| * | | | | | | | | | Finish my sentence. [ci skip]Connor Shea2016-06-221-2/+1
| | | | | | | | | | |
| * | | | | | | | | | Update Todos documentation and screenshots to include new functionality.inline-todos-docsConnor Shea2016-06-215-21/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add information about manually creating Todos from issue and merge request sidebars. [ci skip]
* | | | | | | | | | | Merge branch 'dz-version-bump' into 'master' Robert Speicher2016-06-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Time for 8.10.0-pre See merge request !4852
| * | | | | | | | | | | Time for 8.10.0-prev8.10.0.preDmitriy Zaporozhets2016-06-221-1/+1
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | Merge branch 'arrow-nav-bug' into 'master' Jacob Schatz2016-06-223-17/+10
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide nav arrows by default ## What does this MR do? - Fixes the arrow icon flashing on page load - Removes settings dropdown at higher breakpoint - Removes unneeded CSS Closes #18941 ## Screenshots (if relevant) Arrow flashing bug: ![icon](/uploads/3db95626acd0adb37438bdbc2c4aa154/icon.gif) Settings dropdown breaking nav: <img src="/uploads/4351035f4cf8cb9fd892b621e6339e50/Screen_Shot_2016-06-21_at_4.25.50_PM.png" width="800px"> @alfredo1 would you mind double checking this to make sure the arrow flashing is definitely not happening? See merge request !4843
| * | | | | | | | | | Hide nav arrows by default; remove settings dropdown btn at larger ↵arrow-nav-bugAnnabel Dunstone2016-06-213-17/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | breakpoint; remove unneccessary CSS
* | | | | | | | | | | Fix CHANGELOGRémy Coutable2016-06-221-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | Merge branch 'doc_refactor_labels' into 'master' Achilleas Pipinellis2016-06-2220-18/+150
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor labels docs Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18555 See merge request !3347
| * | | | | | | | | | | Refactor labels documentationAchilleas Pipinellis2016-06-2214-26/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add new images to match the new UI - Document the new prioritize feature
| * | | | | | | | | | | Move labels documentation to new locationdoc_refactor_labelsAchilleas Pipinellis2016-06-2118-117/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to https://gitlab.com/gitlab-org/gitlab-ce/issues/3349