Commit Graph

282 Commits

Author SHA1 Message Date
Filipa Lacerda 074fcb56bb
Adds JS unit tests
Finishes tabs & table
Updates e2e tests
2017-11-27 17:28:33 +00:00
Filipa Lacerda 1b40a9f803
Handle toggle button with API request
Add tests
Update empty state
[ci skip]
2017-11-24 21:08:15 +00:00
Filipa Lacerda 4563156256 Improve environments performance 2017-11-23 12:04:03 +00:00
Filipa Lacerda be4abe7719 Stops page reload when changing tabs or pages - uses API requests instead 2017-11-14 15:35:29 +00:00
Clement Ho b22f4d2aad Merge branch '20666-404-error-issue-assigned-with-issues-disabled' into 'master'
Fixes 404 error to `Issues assigned to me` and `Issues I've created` when issues are disabled

Closes #20666

See merge request gitlab-org/gitlab-ce!15021
2017-11-06 22:39:07 +00:00
Jacopo d4a9aedf55 Fixes 404 error to `Issues assigned to me` and `Issues I've created` when issues are disabled
The dropdown options `Issues assigned to me` and `Issues I've created` in project search are now
hidden when issues are disabled on the project.
2017-11-06 21:30:18 +01:00
Shinya Maeda 600d5f4fba Fix tests. Remove NOT NULL constraint from cluster.user. 2017-11-03 17:22:49 +09:00
Filipa Lacerda f4c10492f4
Fix sidebar title
Fix fixture
2017-10-06 12:16:08 +01:00
Shinya Maeda 88cc9d5294 Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service 2017-10-05 14:49:16 +09:00
Kamil Trzcinski bee5c08094 Fix Rubocop failures 2017-10-04 21:13:01 +02:00
Filipa Lacerda 2e53056e94 Adds Frontend specs 2017-10-04 16:45:02 +01:00
Jacopo e050313049 Hide close MR button after merge without reloading page
After merging a MR the close button is hidden, without reloading the page.
2017-09-24 12:42:29 +02:00
Tim Zallmann 55f772bb98 Resolve "Better SVG Usage in the Frontend" 2017-09-22 08:39:47 +00: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
Jose Ivan Vargas b623807682 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2017-09-03 16:09:59 -05:00
Gabriel Mazetto a882026bdf Cleaning up repositories for javascript fixture specs to work correctly
We need to cleanup after each execution so we can still re-use the same
paths and prevent collision with the on disk validation
2017-08-30 20:22:48 +02:00
Douwe Maan fbe82e4cd9 Merge branch 'master' into issue-discussions-refactor
# Conflicts:
#	package.json
2017-08-23 11:31:17 +02:00
Bryce Johnson 4add91b6e1 Use non-i18n values for setting new group-level issue/MR button text 2017-08-21 21:29:09 +00:00
Douwe Maan 834f1b30d5 Merge branch 'master' into issue-discussions-refactor
# Conflicts:
#	package.json
#	spec/support/features/reportable_note_shared_examples.rb
2017-08-17 14:01:31 +02:00
Robert Speicher 142b9ec4a0 Fix two additional violations caused by previous changes 2017-08-15 15:53:16 -04:00
Robert Speicher 4edfad9678 Enable Layout/TrailingWhitespace cop and auto-correct offenses 2017-08-15 13:44:37 -04:00
Filipa Lacerda e93214bce6 Merge branch 'master' into issue-discussions-refactor
* master: (66 commits)
  fix confidential border issue as well as confidential styles leaking on new MR
  Migrate force push check to Gitaly
  Add option to disable project export on instance
  Better categorize test coverage results
  Add option to disable project export on instance - db changes
  Better caching and indexing of broadcast messages
  Include the `is_admin` field in the `GET /users/:id` API when current user is an admin
  Document rspec-retry and rspec-flaky
  Fix cop description
  Retrieve and sync flaky specs report from and to S3
  Use a new RspecFlakyListener to detect flaky specs
  Fix formatting of patch_versions.md [skip ci]
  Enable Timecop safe mode
  Show error message for API 500 error in tests, and
  Fix merge request diff deserialisation when too_large was absent
  Delete correct key from `session` after authenticating using U2F
  Bumps omniauth-ldap gem version to 2.0.4
  Pending delete projects no longer return 500 error in Admins projects view
  Do not run the `ee_compat_check` job for stableish branches
  Update gitlab.po: Missing 'r' in "Fouché" that comes from "Fourcher" verb.
  ...
2017-08-12 00:17:48 +01:00
Robert Speicher c8b802471b Enable the RSpec/HookArgument cop and auto-correct offenses 2017-08-10 19:29:42 -04:00
Filipa Lacerda d323bb79eb Change fixtures of old tests 2017-08-10 16:48:22 +01:00
winh d1500e898b Restore blob fixture for JavaScript tests 2017-08-08 23:25:01 +02:00
Mike Greiling 0994bbf9dd Merge branch 'master' into ide
* master: (86 commits)
  Show all labels
  33874 confidential issue redesign
  Exclude merge_jid on Import/Export attribute configuration
  Resolve "User dropdown in filtered search does not load avatar on `master`"
  Re-add column locked_at on migration rollback
  Group-level new issue & MR using previously selected project
  [EE Backport] Update log audit event in omniauth_callbacks_controller.rb
  more eagerly bail when the state is prevented
  Move locked_at removal to post-deployment migration
  Add class to other sidebars
  Improve mobile sidebar
  reduce iterations by keeping a count of remaining enablers
  Store & use ConvDev percentages returned by Version app
  Store MergeWorker JID on merge request, and clean up stuck merges
  Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE
  DRY up caching in AbstractReferenceFilter
  Update CHANGELOG
  Add CHANGELOG entry
  Fix html structure Removes test for removed behavior
  Port form back to use form_tag
  ...
2017-08-07 22:44:47 -05:00
Bryce Johnson 0532bff6d4 Group-level new issue & MR using previously selected project 2017-08-07 20:55:50 +00:00
Douwe Maan 2197ee02e9 Merge branch 'master' into ide 2017-08-03 13:13:06 +02:00
Robert Speicher 72a7b30c9f Change all `:empty_project` to `:project` 2017-08-02 17:47:31 -04:00
Robert Speicher 9513bd18c4 Ensure all project factories use `:repository` trait or `:empty_project` 2017-08-01 14:51:52 -04:00
Luke "Jared" Bennett dc04fdc1a3
Merge remote-tracking branch 'origin/master' into ide 2017-07-28 15:26:00 +01:00
Luke "Jared" Bennett 6448368b5b
Merge remote-tracking branch 'origin/master' into ide 2017-07-20 17:51:07 +01:00
Jacopo 0b5133bac2 Extract "@request.env['devise.mapping'] = Devise.mappings[:user]" to a test helper
Extracted `@request.env['devise.mapping'] = Devise.mappings[:user]` and `Rails.application.env_config['devise.mapping'] = Devise.mappings[:user]`
in our tests into the helper method `set_devise_mapping`
2017-07-20 18:36:53 +02:00
Luke "Jared" Bennett 9c521c8526
Made BlobViewer jasmine integration spec use snippets view instead of pblob view 2017-07-17 17:55:50 +01:00
Timothy Andrew 8d49a9fd58 Add Jasmine tests for `OAuthRememberMe` 2017-07-06 06:30:07 +00:00
Douwe Maan 70b05a8377 Split up MergeRequestsController 2017-06-28 18:17:44 -05:00
Grzegorz Bizon 8fe5602c1a Merge branch '28717-additional-metrics-review-branch' into 'master'
Support additional prometheus metrics - review branch

Closes #28717

See merge request !11712
2017-06-22 16:35:05 +00:00
Pawel Chojnacki 97c42df3b8 Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-review-branch 2017-06-22 15:05:52 +02:00
Eric Eastwood 5145e39ef7 Fix linking to line number on parallel diff creating empty discussion
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/34010
2017-06-21 10:16:06 -05:00
Jacob Schatz b2e1d32e7a Merge branch '33868-fix-mr-changes-diff-note-up-arrow-editing' into 'master'
Fix pressing up-arrow on a MR "Changes" diff discussion edits your last note

Closes #33868

See merge request !12297
2017-06-20 19:31:02 +00:00
Filipa Lacerda 05cfba6f6d Uniformize code between both pipelines tables 2017-06-20 14:54:55 +00:00
Eric Eastwood f7ad9e5abb Fix MR "Changes" diff note up arrow to edit last note
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33868

While in a MR "Changes" tab looking at some diff note discussions.
Clicking reply and pressing the up-arrow should edit your last comment in
that discussion.

I suspect this regressed in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11173/diffs#f4bb984ec495c5cb58516785c62978f5209c39b4_179_178
where we changed the selector
2017-06-20 00:31:21 -05:00
Pawel Chojnacki be5f665557 Fix prometheus service frontend fixture 2017-06-16 18:26:40 +02:00
Pawel Chojnacki 9f2c992ff1 Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-review-branch 2017-06-16 18:19:41 +02:00
Pawel Chojnacki 64bb0d37d4 cleanup wip 2017-06-16 16:53:02 +02:00
Douwe Maan b38c74d696 Revert 'New file from interface on existing branch' 2017-06-09 10:10:47 -05:00
Douwe Maan 0bcb1d35ec Merge branch 'expand-backlog-closed-lists-issue-boards' into 'master'
Expand/collapse close & backlog lists in issue boards

Closes #23917

See merge request !11820
2017-06-07 15:05:37 +00:00
Pawel Chojnacki dbb3c28088 Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-review-branch
# Conflicts:
#	app/models/project_services/prometheus_service.rb
#	app/views/projects/services/_form.html.haml
2017-06-07 10:27:52 +02:00
Bryce Johnson c9a67266d2 Move issuable bulk edit form into a new sidebar. 2017-06-06 09:16:27 -04:00
Tim Zallmann 51c196160a Merge branch 'winh-styled-people-search-bar' into 'master'
Style people in issuable search bar

Closes #30468

See merge request !11402
2017-06-02 16:40:57 +00:00
Phil Hughes a980a4f638 added tests for collapsing 2017-06-02 17:25:18 +01:00
Sean McGivern dab2662194 Merge branch '31511-jira-settings' into 'master'
Simplify test&save actions when setting a service integration

Closes #31511

See merge request !11599
2017-06-02 14:03:15 +00:00
winh b22970648e Add frontend fixture for issue list 2017-06-02 14:42:03 +02:00
Filipa Lacerda f74f03383f Merge branch 'notebook-katex-fixes' into 'master'
Fixes multi-line math in notebooks

Closes #30900 and #33074

See merge request !11789
2017-06-01 09:23:31 +00:00
kushalpandya 325c55fb24 Remove extra new line 2017-06-01 07:47:16 +02:00
kushalpandya a678f42ebb Tests for `integration_settings_form` 2017-06-01 07:47:16 +02:00
kushalpandya c3c644c722 Prometheus Service Fixture Generator 2017-05-31 17:10:30 +05:30
Phil Hughes c65a8a6e3a added tests 2017-05-30 16:00:57 +01:00
Lin Jen-Shin 71777a4a18 Rename BuildsController to JobsController
Rename other URL generators

admin_builds_path -> admin_jobs_path

Fix tests and more renaming

Fix more tests

Also change build_id to job_id in the controller
2017-05-17 20:17:30 +08:00
Luke "Jared" Bennett b504b09b68 Added balsamiq jasmine integration test 2017-05-15 07:48:54 +00:00
winh a7a53cd012 Replace pipeline mock data with JSON fixture 2017-05-10 18:12:18 +02:00
Phil Hughes ee01ebd9e4 Fixed UP arrow key not editing last comment in discussion
Closes #31348
2017-05-08 14:31:11 +01:00
Kamil Trzcinski aa440eb1c0
Single commit squash of all changes for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10878
It's needed due to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10777 being merged with squash.
2017-05-06 19:04:48 +02:00
Winnie Hellmann b51f2a6080 Colorize labels in issue search field 2017-05-05 22:47:32 +00:00
Phil Hughes 79f40f27fd Merge branch 'master' into deploy-keys-load-async 2017-05-04 15:54:16 +01:00
Filipa Lacerda e69732e2fb Pipeline table mini graph dropdown remains open when table is refreshed 2017-05-04 13:11:48 +00:00
Phil Hughes f29e5d4d93 Merge branch 'master' into deploy-keys-load-async 2017-05-03 17:04:47 +01:00
Douwe Maan d048d9268c Merge branch 'metrics-deployment-history' into 'master'
Metrics deployment history

Closes #26914

See merge request !10649
2017-05-02 16:56:49 +00:00
Phil Hughes 54beb93ac3 Merge branch 'pdflab-in-repo' into 'master'
Move PDFLab assets into repo

See merge request !10642
2017-05-02 07:35:49 +00:00
Phil Hughes 96ea22208f Started specs [ci skip] 2017-05-02 08:29:39 +01:00
Douwe Maan 60ebd101d0 Use blob viewers for snippets 2017-04-30 11:21:20 -05:00
Sam Rose 9f3985c613 Move PDFLab into GitLab 2017-04-28 12:52:36 -04:00
Douwe Maan 7cc4546bc9 Add specs 2017-04-27 12:23:26 -05:00
Phil Hughes ee0713babb Generate fixutre for metrics page 2017-04-25 11:23:04 +01:00
Phil Hughes b55ab7abc6 Merge remote-tracking branch 'origin/26914-deploy_history_data_source' into metrics-deployment-history 2017-04-20 12:14:48 +01:00
Phil Hughes 5d8891fb85 Added tests 2017-04-18 11:57:54 +01:00
Phil Hughes 1d99c7755c Merge branch 'master' into notebooklab-in-repo 2017-04-13 20:08:47 +01:00
Simon Knox 3cc806ee13 tests for success and failure of deleting branch from MR page 2017-04-13 22:25:08 +10:00
Phil Hughes 59616dc750 Fixed up some code
Improved the design
Pulls the endpoint from the HAML
2017-04-12 15:31:14 +01:00
Phil Hughes bf5248ac28 Pull in fixture files from the repo 2017-04-11 21:25:10 +01:00
Jose Ivan Vargas Lopez 79d299f9af Introduced empty/error UX states to environments monitoring. 2017-04-06 13:24:33 +00:00
Sam Rose dad30d6bbf Use PDFLab to render PDFs in GitLab 2017-04-05 11:22:12 -04:00
Jacob Schatz fd8a40783d Load a preview of Sketch 43 files
Sketch 43 files are technically a zip file, so the JavaScript opens the
zip file & locates a preview.png which is just a quick preview of the
last sketch page edited. After that is loaded it simply places the image
into the DOM
2017-04-05 11:49:08 +01:00
Alfredo Sumaran 1ccf4af3c5 Merge branch '29539-fix-pipelines-container-width-with-parallel-diff' into 'master'
Reset container width when switching to pipelines MR tab

Closes #29539

See merge request !10169
2017-03-29 23:29:38 +00:00
Jacob Schatz 47aeacd7f5 Merge branch 'ipython-notebook-viewer' into 'master'
iPython notebook viewer

See merge request !10017
2017-03-28 19:29:02 +00:00
Eric Eastwood 880b53e0b4 Reset container width when switching to pipelines MR tab
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29539
2017-03-28 10:59:54 -05:00
Phil Hughes 3eedb2aede Refactored the user callout class
Instead of the JS being in charge of the HTML, the HAML now handles it.
The HAML can then check the cookie & show it needed. It also allows the
HAML access to the paths so we don't have to pass that through.

Closes #29955
2017-03-24 16:36:23 +00:00
Phil Hughes 0ef8585726 Added tests 2017-03-23 12:37:24 +00:00
Filipa Lacerda 2dc4eddf13 Fix haml_lint error 2017-03-20 21:25:52 +00:00
Filipa Lacerda 446b59dd4e Adds tests to new empty and error states 2017-03-20 16:16:19 +00:00
Jacopo e0fe2834eb New file from interface on existing branch
Now you can create a new file and select a target_branch != source_branch.
If the file that you want to create already exists on the target branch an error message is shown
A glDropdown is used to select and create a new branch instead of a text field.
2017-03-13 16:36:11 +01:00
Kamil Trzciński 55f2a5debc Added Prometheus Service and Prometheus graphs 2017-03-07 16:57:42 +00:00
Eric Eastwood e6fc0207cb Use native unicode emojis
- gl_emoji for falling back to image/css-sprite when the browser
   doesn't support an emoji
 - Markdown rendering (Banzai filter)
 - Autocomplete
 - Award emoji menu
    - Perceived perf
    - Immediate response because we now build client-side
 - Update `digests.json` generation in gemojione rake task to be more
   useful and  include `unicodeVersion`

MR: !9437

See issues

 - #26371
 - #27250
 - #22474
2017-03-06 12:54:46 -06:00
James Lopez a0101ebf84 Update occurrences of MWBS to MWPS
Rename column in the database
 Rename fields related to import/export feature
 Rename API endpoints
 Rename documentation links
 Rename the rest of occurrences in the code
 Replace the images that contain the words "build succeeds" and docs referencing to them
 Make sure pipeline is green and nothing is missing.

updated doc images

renamed only_allow_merge_if_build_succeeds in projects and fixed references

more updates

fix some spec failures

fix rubocop offences

fix v3 api spec

fix MR  specs

fixed issues with partials

fix MR spec

fix alignment

add missing v3 to v4 doc

wip - refactor v3 endpoints

fix specs

fix a few typos

fix project specs

copy entities fully to V3

fix  entity error

more fixes

fix failing specs

fixed missing entities in V3 API

remove comment

updated code based on feedback

typo

fix spec
2017-03-01 12:02:02 +01:00
Filipa Lacerda e96851fceb Merge branch 'user-callouts' into 'master'
Added user-callouts

Closes #27269

See merge request !9249
2017-02-24 20:09:24 +00:00
Douwe Maan ad640bc5f9 Use Namespace#full_path instead of #path where appropriate 2017-02-23 17:55:01 -06:00
Jose Ivan Vargas 2f681138dc Modified the user_callout behaviour
Now it appends a template instead of relying in a partial
to show it.
2017-02-23 15:47:23 -06:00
Jose Ivan Vargas 46eefbda3a Moved the dismiss-icon listener to close the callout to a button 2017-02-23 15:47:23 -06:00
Jose Ivan Vargas bcab4bb5ef Changed the javascript class from using the global scope to exporting it via webpack
Also improved accesibility and change the id from user_callouts to a class
2017-02-23 15:47:23 -06:00