summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* disable CI variable complex expressions by defaultci-variables-complex-expression-default-disableddrew cimino2019-06-124-4/+4
* Merge branch 'docs/add-selected-youtube-videos' into 'master'Marcia Ramos2019-06-122-0/+4
|\
| * Add links to select YouTube videos demonstrating GitLab features to docsMike Lewis2019-06-122-0/+4
|/
* Merge branch 'remove-grafana-dashboard-link-feature-flag' into 'master'Mike Greiling2019-06-125-58/+21
|\
| * Remove the grafana_dashboard_link feature flagReuben Pereira2019-06-125-58/+21
|/
* Merge branch '62134-fix-non-wraping-project-description' into 'master'Clement Ho2019-06-122-1/+6
|\
| * Adding break-word css to home-panel-description class to correctly word wrap ...Erik van der Gaag2019-06-122-1/+6
|/
* Merge branch 'ce-11629-notify-users-when-their-ci-minutes-quota-has-run-out' ...Mayra Cabrera2019-06-123-1/+22
|\
| * Backport of gitlab-ee!13735Rubén Dávila2019-06-123-1/+22
|/
* Merge branch '63010-visual-regression-in-12-0-line-numbers-not-lining-up-in-f...Annabel Dunstone Gray2019-06-121-3/+3
|\
| * Align line numbers for non-default font size63010-visual-regression-in-12-0-line-numbers-not-lining-up-in-file-viewSimon Knox2019-06-101-3/+3
* | Merge branch 'sh-fix-resolve-button-not-available' into 'master'Fatih Acet2019-06-123-3/+79
|\ \
| * | Fix "Resolve conflicts" button not appearing for some userssh-fix-resolve-button-not-availableStan Hu2019-06-113-3/+79
* | | Merge branch 'ealcantara-popover-styling' into 'master'Annabel Dunstone Gray2019-06-127-43/+93
|\ \ \
| * | | Nest category-icon inside .user-popoverealcantara-popover-stylingEnrique Alcantara2019-06-071-4/+4
| * | | Cleanup deprecation message popoverEnrique Alcantara2019-06-073-25/+1
| * | | Extract user-popover stylesEnrique Alcantara2019-06-071-0/+4
| * | | Address feature highlight popover inconsistenciesEnrique Alcantara2019-06-073-6/+4
| * | | Style popovers according to the design specsEnrique Alcantara2019-06-074-15/+87
* | | | Merge branch 'sh-update-openid-omniauth-gem' into 'master'Douglas Barbosa Alexandre2019-06-124-17/+3
|\ \ \ \
| * | | | Bump omniauth_openid_connect to 0.3.1sh-update-openid-omniauth-gemStan Hu2019-06-084-17/+3
* | | | | Merge branch 'jc-migration-for-source-project-id' into 'master'Andreas Brandl2019-06-123-0/+53
|\ \ \ \ \
| * | | | | Fix null source_project_id in pool_repositoriesjc-migration-for-source-project-idJohn Cai2019-06-113-0/+53
* | | | | | Merge branch 'add_video_to_jira_int' into 'master'Mike Lewis2019-06-122-2/+4
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | Use Prometheus API for dashboard metricsprom-api-3Simon Knox2019-06-0710-14/+234
* | | | | | | | Merge branch 'upgrade-pages-to-v1.6.1' into 'master'Nick Thomas2019-06-122-1/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 localsfix-diverged-branch-localsLuke Bennett2019-06-122-1/+6
* | | | | | | | | Merge branch 'prom-api-2' into 'master'Mike Greiling2019-06-1212-13/+266
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Add feature flag and dashboard endpointprom-api-2Simon Knox2019-06-0712-13/+266
* | | | | | | | | Merge branch 'rack-timeout-rename' into 'master'Bob Van Landuyt2019-06-124-50/+74
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Monitor only final statesrack-timeout-renameJan Provaznik2019-06-122-3/+25
| * | | | | | | | | Moved RackTimeout observer to a different locationJan Provaznik2019-06-124-48/+50
* | | | | | | | | | Merge branch '10891-usage-ping-for-incident-management-ce' into 'master'Rémy Coutable2019-06-121-0/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Extract ide_status_list from ide_status_barPaul Slaughter2019-06-125-23/+124
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '58433-email-notifications-do-not-work-properly-issue-due-date' ...Nick Thomas2019-06-123-2/+241
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \