Commit Graph

1542 Commits

Author SHA1 Message Date
kushalpandya ce884ad308 Remove confidential toggle checkbox and related code as no longer necessary 2017-09-11 09:28:51 +05:30
Sean McGivern 56509d22d6 Merge branch 'backport-issues-controller-changes' into 'master'
Move issues index variable setting to a method

See merge request !14048
2017-09-08 09:14:57 +00:00
Tim Zallmann d3efad453a Merge branch 'support-additional-colors' into 'master'
Supports additional colors and labels for the prometheus monitoring dashboard

Closes #34629

See merge request !14065
2017-09-08 08:33:25 +00:00
Jacob Schatz 941a2d2737 Merge branch 'fix-comment-reflection' into 'security-9-5'
Fix Live Comment XSS Vulnerability

See merge request gitlab/gitlabhq!2183
2017-09-07 20:22:16 -04:00
Jose Ivan Vargas 7f5ae2e8b2 Changed how the backend response is handled for when instead of series 2017-09-07 17:16:31 -05:00
Bryce Johnson 3d9b6bc2b9 Merge branch 'master' into backport-issues-controller-changes 2017-09-07 14:46:23 -04:00
Kamil Trzciński 21b16c5a16 Merge branch '37158-autodevops-banner' into 'master'
Resolve "Banner to enable Auto DevOps at project level"

Closes #37158

See merge request !13991
2017-09-07 18:06:50 +00:00
Kamil Trzciński f88659d005 Merge branch 'zj-auto-devops-table' into 'master'
Implement the implied CI/CD config for AutoDevOps

Closes #34777

See merge request !13923
2017-09-07 17:28:30 +00:00
Kamil Trzcinski 129b4eb1de Merge branch 'zj/gitlab-ce-zj-auto-devops-table' into 37158-autodevops-banner 2017-09-07 18:47:08 +02:00
Tim Zallmann ec304cb929 Merge branch '37513-projects-dropdown-copy-tweaks' into 'master'
Change strings for projects dropdown placeholder and error state

Closes #37513

See merge request !14079
2017-09-07 16:14:10 +00:00
Kamil Trzcinski 12ddc28f84 Merge remote-tracking branch 'origin/master' into zj/gitlab-ce-zj-auto-devops-table 2017-09-07 18:03:20 +02:00
Bryce Johnson 1bd4cd4441 Backport getAllParams and other nav changes from service desk. 2017-09-07 11:49:36 -04:00
Jose Ivan Vargas b71eb1da5b Added minor details to specs 2017-09-07 09:45:30 -05:00
Jose Ivan Vargas 93ba3fdd1e small fixes to code and specs 2017-09-07 09:19:13 -05:00
Jose Ivan Vargas 75b8f64ac3 Added specs for the additional color support 2017-09-07 09:19:13 -05:00
Jose Ivan Vargas 057e84d6e3 Renamed some components 2017-09-07 09:19:12 -05:00
Sean McGivern b4778a5866 Merge branch 'ee_issue_928_backport' into 'master'
Group boards CE backport

See merge request !13883
2017-09-07 13:42:23 +00:00
Filipa Lacerda 2c4d57ffdf Updates tests and i18n 2017-09-07 14:40:59 +01:00
Filipa Lacerda b8adc0d042 Merge branch 'fly-out-top-level-item' into 'master'
Add top level items to fly-out navigation

Closes #36294

See merge request !13981
2017-09-07 13:26:48 +00:00
Kamil Trzcinski e5e0acfc4d Merge branch 'zj-auto-devops-table' of gitlab.com:zj/gitlab-ce into 37158-autodevops-banner 2017-09-07 15:21:30 +02:00
Zeger-Jan van de Weg 62a5cc7134
Merge branch 'master' into zj-auto-devops-table 2017-09-07 15:20:04 +02:00
Chris Peressini e3c76e6b1b Change strings for projects dropdown placeholder and error state
gitlab-ce#37513
2017-09-07 12:27:39 +00:00
Tim Zallmann c57f60793d Merge branch '37023-remove-focus-styles-from-dropdown-empty-link' into 'master'
Remove focus styles from dropdown empty link

Closes #37023

See merge request !13907
2017-09-07 07:03:37 +00:00
Kamil Trzcinski 64db707774 Merge branch 'zj/gitlab-ce-zj-auto-devops-table' into 37158-autodevops-banner 2017-09-06 21:03:07 +02:00
Phil Hughes c56100b3ec Add top level items to fly-out navigation
This only appears when in the collapsed sidebar. If the sidebar is expanded, then these items are hidden & no fly-out navigation is displayed.

Closes #36294
2017-09-06 14:54:17 +01:00
Zeger-Jan van de Weg 8189347b49
Merge branch 'master' into zj-auto-devops-table 2017-09-06 15:16:38 +02:00
Simon Knox 563c7de58e api js changes not needed for CE 2017-09-06 18:02:30 +10:00
Mike Greiling 70bff97c27 Use flexbox for prometheus graph row grouping instead of bootstrap classes 2017-09-06 07:42:47 +00:00
Simon Knox eff1c1213e backport boards specs 2017-09-06 16:55:23 +10:00
Simon Knox c28d52a3a5 FE backport of group boards to reduce CE conflicts 2017-09-06 15:41:00 +10:00
Eric Eastwood 21446129ac Remove focus styles from dropdown empty link
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/37023
2017-09-05 20:52:01 -05:00
Winnie Hellmann 8769961679 Make search dropdowns consistent 2017-09-05 22:29:54 +00:00
kushalpandya 29ff4aa051 Fix flaky behaviour of `getSearchedProjects` due to missing `gon.current_user_id` 2017-09-05 19:23:46 +05:30
kushalpandya ca4a6e983c Remove spec as no longer necessary 2017-09-05 19:02:55 +05:30
Filipa Lacerda 6e4949dba1 Merge branch '35010-projects-nav-dropdown' into 'master'
Add dropdown to Projects nav item

Closes #35010

See merge request !13866
2017-09-05 13:19:27 +00:00
Filipa Lacerda 8eec09249c Sets callout dissmiss cookie per project using a path 2017-09-05 12:04:19 +01:00
Tim Zallmann 83eb26264c Merge branch 'additional-time-series-charts' into 'master'
Added support for additional time series charts

Closes #33345

See merge request !13159
2017-09-05 08:33:23 +00:00
kushalpandya 4e60d19167 Projects Dropdown Spec Mock Data 2017-09-05 13:11:21 +05:30
kushalpandya b4ffaf9eac Projects Dropdown App Store Spec 2017-09-05 13:11:21 +05:30
kushalpandya 3fcc7460f0 Projects Dropdown App Service Spec 2017-09-05 13:11:21 +05:30
kushalpandya c45646eb24 Projects Dropdown Frequent Projects Item Component Spec 2017-09-05 13:11:21 +05:30
kushalpandya edffb980c0 Projects Dropdown Searched Projects List Component Spec 2017-09-05 13:11:21 +05:30
kushalpandya 035049c6af Projects Dropdown Frequent Projects List Component Spec 2017-09-05 13:11:21 +05:30
kushalpandya cc807277bd Projects Dropdown Search Component Spec 2017-09-05 13:11:21 +05:30
kushalpandya 399d8ffc34 Projects Dropdown App Component Spec 2017-09-05 13:11:21 +05:30
kushalpandya 8c70224d18 Add support for `sizeClass`, defaults to `s40` 2017-09-05 13:11:20 +05:30
kushalpandya c47e1c3975 Make query param `simple` part of config 2017-09-05 13:11:20 +05:30
Clement Ho e7bc0d7c20 Add feature highlight to Issue Boards in new navigation sidebar 2017-09-04 12:13:58 +00:00
Zeger-Jan van de Weg a315e6025c
Merge branch 'master' into zj-auto-devops-table 2017-09-04 09:28:46 +02:00
Eric Eastwood 90c60138db Move "Move to different project" to sidebar
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/34261
2017-09-03 22:03:17 -05:00