Commit Graph

169 Commits

Author SHA1 Message Date
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
Jose Ivan Vargas 103f5a116b Created unit tests, fixtures and integration tests
Also changed the user_callout haml to a partial and
added the corresponding SVG icon
2017-02-23 15:47:23 -06:00
wendy0402 94255217e9 on branch deletion show loading icon and disabled the button
after user click delete branch, there is no processing indication, and user can click many times till. It seems flaw in UX. this will fix it

fix bug in branch deletion link
2017-02-22 23:13:25 +07:00
Mike Greiling c74b7eb271 fix overlooked window binding in spec files 2017-02-17 17:02:14 -06:00
Clement Ho 7dd7ffc17b Merge branch 'dynamic-project-title-fixture' into 'master'
Replace static fixture for project_title_spec.js

See merge request !9175
2017-02-17 16:11:27 +00:00
Sean McGivern aa792b91bb Merge branch '26200-convert-sidebar-to-dropdown' into 'master'
Resolve "Update global sidebar to dropdown"

Closes #26200

See merge request !9199
2017-02-17 11:34:09 +00:00
Filipa Lacerda ea7c776957 Merge branch 'fe-paginated-environments-api' into 'paginate-environments-bundle'
Integrate with new environments API

See merge request !8954
2017-02-16 12:30:18 +00:00
Filipa Lacerda 1285d62906 Move change page param to utility function
Add tests

Adds folder name in the top of the table
2017-02-15 19:57:48 +00:00
Annabel Dunstone Gray f1710bd131 Delete sidebar specs and fixtures; update shortcuts_spec to check page title 2017-02-15 13:31:18 -06:00
Clement Ho ad5e772bdd Merge branch 'requires-input-fixture' into 'master'
Replace static fixture for behaviors/requires_input_spec.js

See merge request !9162
2017-02-14 18:39:01 +00:00
winniehell 409a325043 Replace static fixture for behaviors/requires_input_spec.js (!9162) 2017-02-14 18:20:58 +01:00
winniehell d8517fd457 Replace static fixture for right_sidebar_spec.js (!9211) 2017-02-14 12:04:35 +01:00
winniehell b06ac70ab5 Add dynamic fixture for todos 2017-02-14 12:04:35 +01:00
Alfredo Sumaran e5f446b7ca Merge branch 'quick-submit-fixture' into 'master'
Replace static fixture for behaviors/quick_submit_spec.js

See merge request !9086
2017-02-13 19:36:26 +00:00