summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix sidebar flyout navigationfix-flyout-navsLuke Bennett2019-06-135-3/+45
| | | | Show flyout nav for active item when collapsed.
* Merge branch 'sh-update-openid-omniauth-gem' into 'master'Douglas Barbosa Alexandre2019-06-124-17/+3
|\ | | | | | | | | Bump omniauth_openid_connect to 0.3.1 See merge request gitlab-org/gitlab-ce!29387
| * Bump omniauth_openid_connect to 0.3.1sh-update-openid-omniauth-gemStan Hu2019-06-084-17/+3
| | | | | | | | | | | | | | | | | | | | | | | | In https://gitlab.com/gitlab-org/gitlab-ce/issues/62208, users were seeing 404 errors when they configured their OpenID provider without a name parameter since OmniAuth would use the name `openidconnect` instead `openid_connect`. https://github.com/m0n9oose/omniauth_openid_connect/pull/23 makes the default parameter `openid_connect` so this additional initializer in GitLab is not necessary. Plus, this change enables users to use multiple OpenID Connect providers if they desire.
* | Merge branch 'jc-migration-for-source-project-id' into 'master'Andreas Brandl2019-06-123-0/+53
|\ \ | | | | | | | | | | | | | | | | | | Fix null source_project_id in pool_repositories Closes gitaly#1653 See merge request gitlab-org/gitlab-ce!29157
| * | Fix null source_project_id in pool_repositoriesjc-migration-for-source-project-idJohn Cai2019-06-113-0/+53
| | | | | | | | | | | | | | | Due to a bug, some pool_repositories in production have a null source_project_id column. This migration aims to fix those rows.
* | | Merge branch 'add_video_to_jira_int' into 'master'Mike Lewis2019-06-122-2/+4
|\ \ \ | | | | | | | | | | | | | | | | Added links to Jira/Jenkins videos to supplement docs See merge request gitlab-org/gitlab-ce!29516
| * | | Streamline and edit video referencesadd_video_to_jira_intMike Lewis2019-06-121-4/+2
| | | |
| * | | Apply suggestion to doc/user/project/integrations/jira.mdMike Lewis2019-06-121-1/+0
| | | |
| * | | Added links to videos to supplement docsRussell Dickenson2019-06-122-2/+7
| | | |
* | | | Merge branch 'prom-api-3' into 'master'Mike Greiling2019-06-1210-14/+234
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch charts to Prometheus API endpoint CE-3 Closes #58516 See merge request gitlab-org/gitlab-ce!29280
| * | | | Use Prometheus API for dashboard metricsprom-api-3Simon Knox2019-06-0710-14/+234
| | | | | | | | | | | | | | | | | | | | Make API request for each chart
* | | | | Merge branch 'upgrade-pages-to-v1.6.1' into 'master'Nick Thomas2019-06-122-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade pages to v1.6.1 Closes gitlab-pages#228 See merge request gitlab-org/gitlab-ce!29559
| * | | | | Upgrade pages to v1.6.1Vladimir Shushlin2019-06-122-1/+6
|/ / / / /
* | | | | Merge branch 'fix-diverged-branch-locals' into 'master'Stan Hu2019-06-122-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix diverged branch locals See merge request gitlab-org/gitlab-ce!29508
| * | | | | Fix diverged branch localsfix-diverged-branch-localsLuke Bennett2019-06-122-1/+6
| | | | | |
* | | | | | Merge branch 'prom-api-2' into 'master'Mike Greiling2019-06-1212-13/+266
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | Switch charts to Prometheus API endpoint CE-2 See merge request gitlab-org/gitlab-ce!29226
| * | | | | Add feature flag and dashboard endpointprom-api-2Simon Knox2019-06-0712-13/+266
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First part of FE for Prometheus API Dashboard endpoint fetches all info except for chart results Renders empty groups after loading
* | | | | | Merge branch 'rack-timeout-rename' into 'master'Bob Van Landuyt2019-06-124-50/+74
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved RackTimeout observer to a different location and ignore transition states See merge request gitlab-org/gitlab-ce!29214
| * | | | | | Monitor only final statesrack-timeout-renameJan Provaznik2019-06-122-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no reason to monitor transition states so we ignore ready and active states. We can get ratio of completed vs failed requests from final states.
| * | | | | | Moved RackTimeout observer to a different locationJan Provaznik2019-06-124-48/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because there will be similar observer for PumaWorkerKiller, it makes sense to keep both on better place.
* | | | | | | Merge branch '10891-usage-ping-for-incident-management-ce' into 'master'Rémy Coutable2019-06-121-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whitelist query limiting admin usage data endpoint See merge request gitlab-org/gitlab-ce!29488
| * | | | | | | Whitelist query limiting admin usage data endpointPeter Leitzen2019-06-121-0/+6
|/ / / / / / /
* | | | | | | Merge branch 'docs/add_gitflow_video' into 'master'Mike Lewis2019-06-122-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added link to GitFlow video See merge request gitlab-org/gitlab-ce!29517
| * | | | | | | Fix capitalization errorMike Lewis2019-06-121-1/+1
| | | | | | | |
| * | | | | | | Update inclusion of GitLab Flow links in GitLab BasicsMike Lewis2019-06-121-2/+1
| | | | | | | |
| * | | | | | | Update gitlab_flow.md to add GitLab Flow videoMike Lewis2019-06-121-0/+2
| | | | | | | |
| * | | | | | | Added link to GitFlow videodocs/add_gitflow_videoRussell Dickenson2019-06-121-0/+2
| | | | | | | |
* | | | | | | | Merge branch 'ce-5276-5-terminal-sync-status-label' into 'master'Phil Hughes2019-06-125-23/+124
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE for Part 5] 5276 Extract ide_status_list from ide_status_bar See merge request gitlab-org/gitlab-ce!29371
| * | | | | | | | Extract ide_status_list from ide_status_barPaul Slaughter2019-06-125-23/+124
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Why?** The ide_status_list will be used and extended in EE.
* | | | | | | | Merge branch '58433-email-notifications-do-not-work-properly-issue-due-date' ↵Nick Thomas2019-06-123-2/+241
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Email notifications do not work properly (issue due date)" Closes #58433 See merge request gitlab-org/gitlab-ce!28835
| * | | | | | | | Resolve "Email notifications do not work properly (issue due date)"Eugenia Grieff2019-06-123-2/+241
|/ / / / / / / /
* | | | | | | | Merge branch 'typo-fixes' into 'master'Marcia Ramos2019-06-126-47/+48
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Typos See merge request gitlab-org/gitlab-ce!29551
| * | | | | | | | Fix TyposYoginth2019-06-126-47/+48
|/ / / / / / / /
* | | | | | | | Merge branch 'docs/add_autodevops_video' into 'master'Mike Lewis2019-06-121-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add link to Auto DevOps video See merge request gitlab-org/gitlab-ce!29520
| * | | | | | | | Add link to Auto DevOps videoRussell Dickenson2019-06-121-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'docs/add_cicd_example_videos' into 'master'Mike Lewis2019-06-121-1/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add links to CI/CD videos See merge request gitlab-org/gitlab-ce!29526
| * | | | | | | | Add links to CI/CD videosRussell Dickenson2019-06-121-1/+5
|/ / / / / / / /
* | | | | | | | Merge branch 'mj/feature-freeze-process' into 'master'Yorick Peterse2019-06-121-18/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the feature freeze details See merge request gitlab-org/gitlab-ce!29548
| * | | | | | | | Change the feature freeze detailsMarin Jankovski2019-06-121-18/+9
|/ / / / / / / /
* | | | | | | | Merge branch 'add-merge-train-auto-merge-strategy-ce' into 'master'Kamil Trzciński2019-06-121-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (CE Port) [New Auto Merge Strategy] Merge Train See merge request gitlab-org/gitlab-ce!29485
| * | | | | | | | Add auto merge strategiesadd-merge-train-auto-merge-strategy-ceShinya Maeda2019-06-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AddToMergeTrainWhenPipelineSucceeds and MergeTrain
* | | | | | | | | Merge branch '59651-remove-unnecessary-decimal-places-on-chart-axes' into ↵Phil Hughes2019-06-123-2/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Remove unnecessary decimal places on chart axes" Closes #59651 See merge request gitlab-org/gitlab-ce!29468
| * | | | | | | | | Strip trailing decimal zeros from Metrics axis59651-remove-unnecessary-decimal-places-on-chart-axesSimon Knox2019-06-123-2/+21
| | | | | | | | | |
* | | | | | | | | | Merge branch '5615-non-admins-only-archieve-ce' into 'master'Stan Hu2019-06-124-0/+27
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add EE backport for the admin view See merge request gitlab-org/gitlab-ce!29268
| * | | | | | | | | | Add changelog entry5615-non-admins-only-archieve-ceMałgorzata Ksionek2019-06-111-0/+5
| | | | | | | | | | |
| * | | | | | | | | | Add db migrationMałgorzata Ksionek2019-06-112-0/+21
| | | | | | | | | | |
| * | | | | | | | | | Add EE backport for the admin viewMałgorzata Ksionek2019-06-111-0/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'upgrade-capybara' into 'master'Thong Kuah2019-06-1229-44/+45
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade to Capybara 3 See merge request gitlab-org/gitlab-ce!27776
| * | | | | | | | | | | Upgrade to Capybara 3Heinrich Lee Yu2019-06-1229-44/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix whitespace in specs because normalize_ws is slightly different from Capybara 2 behavior
* | | | | | | | | | | | Merge branch '62788-clean-up-pagination' into 'master'Phil Hughes2019-06-128-6/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves table pagination component Closes #62788 See merge request gitlab-org/gitlab-ce!29543