Commit Graph

1567 Commits

Author SHA1 Message Date
Phil Hughes 8ceaafae68 Removed old icons from project page 2017-09-22 16:50:07 +00:00
Tim Zallmann 55f772bb98 Resolve "Better SVG Usage in the Frontend" 2017-09-22 08:39:47 +00:00
Fatih Acet f22f75b752 Fix rendering double note issue. 2017-09-22 04:04:52 +03:00
Jacob Schatz 137c5822ec Merge branch 'acet-fix-comment-form-resize' into 'master'
IssueNotes: Resize comment form after note submit and discard.

Closes #38115

See merge request gitlab-org/gitlab-ce!14401
2017-09-21 20:41:58 +00:00
Bryce Johnson cca06da2e4 Standardize access to CSRF token in JavaScript 2017-09-21 17:53:28 +00:00
Phil Hughes 598b1a17a0 Merge branch '37220-es-modules' into 'master'
Use modules in common utils

See merge request gitlab-org/gitlab-ce!14074
2017-09-21 09:01:51 +00:00
Fatih Acet d9a3bbce61 IssueNotes: Resize comment form after note submit and discard. 2017-09-21 03:08:17 +03:00
Tim Zallmann eebd99b2fc Deleted another Fixture due to User Callout 2017-09-20 20:00:32 +02:00
Tim Zallmann 2e08a13fff Fixture Creation removed 2017-09-20 20:00:32 +02:00
Tim Zallmann dce15f2462 Deleted Karma Specs for userCallout 2017-09-20 20:00:32 +02:00
Fatih Acet 1720464923 Merge branch '37298-the-prettytime-utils-module-could-use-some-light-maintenance' into 'master'
Resolve some tech debt in the prettyTime module

Closes #37298

See merge request gitlab-org/gitlab-ce!14058
2017-09-19 20:17:41 +00:00
Jacob Schatz 8cf2f51ca2 Merge branch 'revert-feature-highlight' into 'master'
Revert feature highlight

Closes #38087

See merge request gitlab-org/gitlab-ce!14373
2017-09-19 19:21:22 +00:00
Clement Ho ca093c4247 Revert feature highlight 2017-09-19 12:42:34 -05:00
Jedidiah a6eb980632 Change all instances of btn-sm to btn-small to keep things consistent 2017-09-19 07:05:31 +00:00
Eric Eastwood 5ecfd3cd0f Fix MR widget with external CI services/integrations
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33287

The MR widget was trying to render the pipelines section when
there are no GitLab CI pipelines which was throwing some NPE
errors.
2017-09-18 18:06:39 -05:00
Mike Greiling 57c97a10b0 Merge branch 'master' into 37220-es-modules
* master: (148 commits)
  Remove gaps under nav on build page
  Replace the 'project/snippets.feature' spinach test with an rspec analog
  Use correct group members path for members flyout link
  Replace the 'project/commits/revert.feature' spinach test with an rspec analog
  Merge branch 'rs-incoming-email-domain-docs' into 'security-10-0'
  Replace the 'project/archived.feature' spinach test with an rspec analog
  Fix broken link in docs/api/wiki.md
  Fixed the new sidebars width when browser has scrollbars
  Improve 'spec/features/profiles/*' specs
  Replace the 'search.feature' spinach test with an rspec analog
  dedupe yarn packages
  add dependency approvals (all MIT license)
  update build image to latest with node 8.x, yarn 1.0.2, and chrome 61
  Ensure we use `Entities::User` for non-admin `users/:id` API requests
  Minor update to address Sean McGivern's comment.
  Add data migration
  Fix setting share_with_group_lock
  created services for keys
  Prepare Repository#merge for migration to Gitaly
  Never connect to webpack-dev-server over SSL
  ...
2017-09-18 10:56:04 -05:00
Phil Hughes 9ddc62ccfc Fixed the new sidebars width when browser has scrollbars 2017-09-16 17:19:59 +00:00
Bryce Johnson 03b7df7b2e Lightly refactor prettyTime module. 2017-09-14 16:33:15 -04:00
Rémy Coutable b06d5b963a
Return only group's members in user dropdowns on issuables list pages
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-09-14 18:04:21 +02:00
Phil Hughes 6a8faac28a
fixed mr widget options spec 2017-09-13 09:54:20 +01:00
Phil Hughes 855c258fdb
fixed todos spec 2017-09-12 15:39:08 +01:00
Filipa Lacerda 08362d80b8 Merge branch 'master' into 37220-es-modules
* master: (35 commits)
  Use WikiPages::CreateService in spec/features/projects/wiki/user_updates_wiki_page_spec.rb
  Replace the 'project/merge_requests/revert.feature' spinach test with an rspec analog
  Docs group mrs list view search bar
  Replace the project/milestone.feature spinach test with an rspec analog
  Make all the tooltips in the same direction on the commit info box
  Reset all connection schema cache after migration tests
  Emoji was rendered as italic
  Adds Event polyfill for IE
  Add gitaly to patch update doc
  Document how to swap database tables.
  Replace 'project/wiki.feature' spinach test with an rspec analog
  Check for sidebar cookie instead of class when resizing window
  update installation and update instructions for 10.0
  Replace the 'project/merge_requests/accept.feature' spinach test with an rspec analog
  Remove confidential toggle checkbox and related code as no longer necessary
  Bump grape_logging gem to 1.7.0 to get status codes for error messages
  Expand filtered parameters to include `token`
  Replace the project/team_management.feature spinach test with an rspec analog
  Replace the profile/emails.feature spinach test with an rspec analog
  Replace project/group_links.feature spinach test with an rspec analog
  ...
2017-09-12 10:49:50 +01:00
Phil Hughes 47ee81ffc6
fixed location.pathname not being reset 2017-09-12 09:33:08 +01:00
kushalpandya ce884ad308 Remove confidential toggle checkbox and related code as no longer necessary 2017-09-11 09:28:51 +05:30
Filipa Lacerda 96e6fc70b4 Import modules instead of using the ones in global namespace
Removes set favicon related methods from global scope
Improves test related with favicon

Removes convertPermissionToBoolean from global scope.
Adds tests for convertPermissionToBoolean - were non existant

Removes setParamInURL from gl.utils

Removes parseIntPagination from gl.utils namespace

Remove normalizeCRLFHeaders from gl.utils namespace

Removes normalizeHeaders from gl.utils namespace

Use gl.utils for filtered search

Fix bad import

Fix broken test by cleaning window.history namespace

Adds changelog
2017-09-09 09:54:27 +01:00
Filipa Lacerda 6a1b84c7b4 Use modules in common utils 2017-09-09 09:54:24 +01:00
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