summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix Google API callbackdocs/gke-clusterAchilleas Pipinellis2017-10-111-1/+1
| | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/38911#note_42966393
* Add link to Google billing accountAchilleas Pipinellis2017-10-091-1/+3
|
* Refine Google integration stepsAchilleas Pipinellis2017-10-061-8/+9
|
* Fix broken linkAchilleas Pipinellis2017-10-061-1/+1
|
* Remove Google sign-in requirementAchilleas Pipinellis2017-10-061-6/+0
|
* Simplify overviewAchilleas Pipinellis2017-10-051-2/+1
|
* Refactor the Google integration pageAchilleas Pipinellis2017-10-051-59/+78
|
* Add docs for GKE integrationAchilleas Pipinellis2017-10-053-0/+98
|
* Merge branch 'patch-26' into 'master'Achilleas Pipinellis2017-10-051-0/+5
|\ | | | | | | | | Update github.md importer docs to clarify branches from forks get created in GL See merge request gitlab-org/gitlab-ce!14670
| * Update github.md importer docs to clarify branches from forks get created in GLLee Matos2017-10-051-0/+5
|/
* Merge branch '38031-monitoring-hover-info-is-clipped' into 'master'Tim Zallmann2017-10-054-1/+45
|\ | | | | | | | | | | | | Resolve "Monitoring hover info is clipped" Closes #38031 See merge request gitlab-org/gitlab-ce!14514
| * Merge branch 'master' into 38031-monitoring-hover-info-is-clipped38031-monitoring-hover-info-is-clippedJose Ivan Vargas2017-10-03492-6601/+12434
| |\
| * | Fixed deployment flag having content hidden when being too far rightJose Ivan Vargas2017-09-274-1/+45
| | |
* | | Merge branch 'group-milestones-breadcrumb' into 'master'Tim Zallmann2017-10-052-1/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixes group milestones breadcrumb links Closes #38781 See merge request gitlab-org/gitlab-ce!14689
| * | | Fixes group milestones breadcrumb linksgroup-milestones-breadcrumbPhil Hughes2017-10-042-1/+7
| | | | | | | | | | | | | | | | Closes #38781
* | | | Merge branch 'rs-qa-default-password' into 'master'Grzegorz Bizon2017-10-052-8/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the default password from the GDK's root user Closes gitlab-qa#73 See merge request gitlab-org/gitlab-ce!14701
| * | | | Use the default password from the GDK's root userRobert Speicher2017-10-052-8/+24
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'use-simple-tmp-ref-path' into 'master'Sean McGivern2017-10-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use simple path for tmp ref, avoiding extra directory See merge request gitlab-org/gitlab-ce!14698
| * | | | | Use simple path for tmp ref, avoiding extra dirLin Jen-Shin2017-10-051-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that we don't have to worry about cleaning empty directories later. This was brought up at: https://gitlab.com/gitlab-org/gitlab-ce/issues/38689#note_42242988
* | | | | Merge branch 'declarative-policy-optimisations' into 'master'Robert Speicher2017-10-053-19/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Speed up DeclarativePolicy::Runner#steps_by_score See merge request gitlab-org/gitlab-ce!14679
| * | | | | Speed up cached_pass? for composite rulesSean McGivern2017-10-051-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both `Or` and `And` would evaluate whether each rule passed, then calculate a value based on the results of all of those. We can actually return early in many cases, without running the rule at all.
| * | | | | Speed up DeclarativePolicy::Runner#steps_by_scoreSean McGivern2017-10-042-11/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were a couple of things here: 1. If the state was already enabled, we don't need to check all the remaining steps - only those that can prevent the state. (An enable followed by an enable is a no-op.) This logic is in `#run`, but we still did the work of scoring and sorting the steps. 2. The sorting is known to be inefficient, but we can make it slightly more efficient by stopping once we have a step with zero score, as that means it's free. Neither of these make this _fast_, especially when called lots of times - as we do when there is lots of activity on an issue - but they do help some.
* | | | | | Merge branch 'rs-qa-update-nokogiri' into 'master'Grzegorz Bizon2017-10-051-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update QA Nokogiri to 1.8.1 See merge request gitlab-org/gitlab-ce!14700
| * | | | | | Update QA Nokogiri to 1.8.1Robert Speicher2017-10-051-4/+4
| | |/ / / / | |/| | | | | | | | | | | | | | | | Resolves three security advisories from bundle-audit
* | | | | | Merge branch '38789-prometheus-graphs-occasionally-have-incorrect-y-scale' ↵Tim Zallmann2017-10-052-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Prometheus graphs occasionally have incorrect Y scale" Closes #38789 See merge request gitlab-org/gitlab-ce!14693
| * | | | | | add CHANGELOG.md entry for !1469338789-prometheus-graphs-occasionally-have-incorrect-y-scaleMike Greiling2017-10-041-0/+5
| | | | | | |
| * | | | | | ensure prometheus graph values are properly typecast as numbersMike Greiling2017-10-041-1/+1
| | | | | | |
* | | | | | | Merge branch 'remove_repo_prefix_from_api' into 'master'Rémy Coutable2017-10-0516-80/+84
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove 'Repo' prefix from API entities Closes #28417 See merge request gitlab-org/gitlab-ce!14694
| * | | | | | Remove 'Repo' prefix from API entitesVitaliy @blackst0ne Klachkov2017-10-0516-80/+84
| |/ / / / /
* | | | | | Merge branch '38036-hover-and-legend-data-should-be-linked' into 'master'Phil Hughes2017-10-058-51/+97
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Hover and legend data should be linked" Closes #38036 See merge request gitlab-org/gitlab-ce!14400
| * | | | | | Resolve "Hover and legend data should be linked"Jose Ivan Vargas Lopez2017-10-058-51/+97
|/ / / / / /
* | | | | | Update CHANGELOG.md for 10.0.3Jarka Kadlecova2017-10-0514-65/+17
| | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceJarka Kadlecova2017-10-0514-78/+145
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch ↵Phil Hughes2017-10-053-34/+22
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37111-monitoring-graph-empty-states-are-gigantic-on-screen-sm-viewport-sizes' into 'master' Resolve "Monitoring graph empty states are gigantic on `screen-sm` viewport sizes" Closes #37111 See merge request gitlab-org/gitlab-ce!14259
| | * | | | | | Resolve "Monitoring graph empty states are gigantic on `screen-sm` viewport ↵Mike Greiling2017-10-053-34/+22
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | sizes"
| * | | | | | Merge branch 'clarify-where-artifacts-metadata-is-generated' into 'master'Grzegorz Bizon2017-10-051-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify where the artifacts metadata .gz is generated See merge request gitlab-org/gitlab-ce!14695
| | * | | | | | Clarify where the artifacts metadata .gz is generatedEric Eastwood2017-10-051-3/+3
| | |/ / / / /
| * | | | | | Merge branch 'jramsay-fix-file-list-title-case' into 'master'Douwe Maan2017-10-054-19/+13
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inconsistent use of sentence case See merge request gitlab-org/gitlab-ce!14668
| | * | | | | | Fix inconsistent use of sentence casejramsay-fix-file-list-title-caseJames Ramsay2017-10-044-19/+13
| | | | | | | |
| * | | | | | | Merge branch 'sh-fix-username-logging' into 'master'Sean McGivern2017-10-053-3/+18
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix username and ID not logging in production_json.log for Git activity Closes gitlab-ee#3611 See merge request gitlab-org/gitlab-ce!14647
| | * | | | | | Fix username and ID not logging in production_json.log for Git activitysh-fix-username-loggingStan Hu2017-10-043-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Devise sets `current_user`, but not all controllers authenticate users by session tokens. Try to use the controller-defined `authenticated_user` if `current_user` is not available. Closes gitlab-org/gitlab-ee#3611
| * | | | | | | Merge branch '37229-mr-widget-status-icon' into 'master'Jacob Schatz2017-10-053-19/+89
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improve merge request widget status icon UX Closes #37229 See merge request gitlab-org/gitlab-ce!14200
| | * | | | | | add changelog37229-mr-widget-status-iconSimon Knox2017-10-031-0/+5
| | | | | | | |
| | * | | | | | Merge remote-tracking branch 'origin' into 37229-mr-widget-status-iconSimon Knox2017-10-031089-7893/+12439
| | |\ \ \ \ \ \
| | * | | | | | | improve merge request widget status icon UXSimon Knox2017-09-202-19/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | x to indicate failure or cannot merge
* | | | | | | | | Update CHANGELOG.md for 9.5.8Jose Ivan Vargas2017-10-042-5/+4
|/ / / / / / / / | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch 'winh-cleanup-select2-dropdowns' into 'master'Annabel Dunstone Gray2017-10-041-99/+46
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup Select2 dropdown styles Closes #37279 See merge request gitlab-org/gitlab-ce!14557
| * | | | | | | Cleanup Select2 dropdown stylesWinnie Hellmann2017-10-041-99/+46
|/ / / / / / /
* | | | | | | Merge branch 'mentions-in-comments' into 'master'Annabel Dunstone Gray2017-10-044-6/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes `@mentions links` have a different styling for better separation See merge request gitlab-org/gitlab-ce!14377
| * | | | | | | Makes `@mentions links` have a different styling for better separationDimitrie Hoekstra2017-10-044-6/+18
|/ / / / / / /