60 Commits
Author SHA1 Message Date
Phil Hughes ed0f26c223 Escapes branch names before appending to dom 2016-06-18 21:49:20 +01:00
Phil Hughes d2362e2edf Tests fix for ref switcher 2016-06-18 21:49:20 +01:00
Phil Hughes 48726e9d30 Updated failing tests 2016-06-08 10:10:51 +01:00
Dmitriy Zaporozhets 442083e0fc Fix file browsing test
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-16 17:56:39 -05:00
Rémy Coutable b2370fefad Fix specs
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-18 14:47:50 +02:00
Rémy Coutable 0aaaae9d05 Fix features specs (hopefully)
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-18 14:47:50 +02:00
Phil Hughes 643fe43d78 Addressed feedback
Removed important from css
2016-04-11 09:43:59 +01:00
Phil Hughes 1ca627f782 Fixed tests 2016-04-07 16:10:44 +01:00
Phil Hughes b310058998 Use new dropdowns for MR compare 2016-04-06 11:08:40 +01:00
Phil Hughes 7fe19046d6 Fixed failing tests 2016-04-06 11:08:40 +01:00
Jacob Schatz 136ba502d3 Change test in an attempt to pass.
Thanks @rspeicher!
2016-03-10 12:20:00 -05:00
Dmitriy Zaporozhets 465d187927 Fix spinach test for wiki markdown render
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-13 21:58:07 +02:00
Dmitriy Zaporozhets c466f389fa Update tests to match new wiki header
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-09 00:56:45 +02:00
Jacob Vosmaer 15a1acb479 Merge remote-tracking branch 'origin/master' into git-raw-workhorse 2016-02-02 15:06:19 +01:00
Stan HuandRémy Coutable f86ddfd365 Render sanitized SVG images
Closes https://github.com/gitlabhq/gitlabhq/issues/9265
2016-02-01 18:25:32 +01:00
Jacob Vosmaer 0197549d57 Cannot see a raw blob without workhorse 2016-01-28 18:09:52 +01:00
Douwe Maan c910bca730 Add tests for new functionality 2015-12-21 11:57:51 +01:00
Douwe Maan c65243427f Fix specs 2015-12-19 18:29:24 +01:00
Douwe Maan f4f4a6b530 Fix specs and behavior for LFS files 2015-12-18 16:14:12 +01:00
Douwe Maan d9c82d679f Automatically fork a project when not allowed to edit a file. 2015-12-18 10:03:34 +01:00
Dmitriy Zaporozhets 40104746d6 Merge remote-tracking branch 'origin/feature/update-rubocop' 2015-12-16 13:44:50 +01:00
Gabriel Mazetto b5291f9599 Fixed Rubocop offenses 2015-12-15 00:53:52 -02:00
Douglas Barbosa Alexandre 5afe03315d Preserve trailing new lines at the end of file on the online editor
Because Haml automatically indents the HTML source code, the contents
of whitespace-sensitive tags like pre and textarea can get screwed up.
2015-12-14 18:22:28 -02:00
Douwe Maan 0f89e6905d Fix spec 2015-12-08 22:31:40 +01:00
Douwe Maan 51ed5225ad Merge branch 'serve_lfs_object' into 'master'
Serve LFS object

Depends on gitlab-org/gitlab_git!57

See merge request !1976
2015-12-08 14:19:52 +00:00
Marin Jankovski 9bf51ae47d Fix specs caused by update of gitlab-test repo. 2015-12-08 10:58:15 +01:00
Marin Jankovski e53b350cb6 Add specs for showing lfs object in UI. 2015-12-07 15:03:50 +01:00
Dmitriy Zaporozhets eb9601d906 Merge branch 'ui/form-consistency' into 'master'
UI: Improve form consistency

Depends on !1953

See the commits for more details, the messages mostly speak for themselves.

# Highlights

## Tag form

Before:

![tag_before](/uploads/ee5ba6ef405749013f9e5717ebcf72f3/tag_before.png)

After:

![tag_after](/uploads/71bb543553190d91c03fd706cce35923/tag_after.png)


See merge request !1955
2015-12-04 09:27:27 +00:00
Douwe Maan 5ab1b11e90 Fix specs 2015-12-03 18:42:37 +01:00
Douwe Maan 97ddf2df00 Merge branch 'master' into ui/wiki 2015-12-03 13:29:35 +01:00
Douwe Maan 0520cd7164 Merge branch 'master' into ui/form-consistency 2015-12-03 13:21:19 +01:00
Douwe Maan 854deae412 Brefer "Directory" over "Dir", "Files" over "Code 2015-12-02 14:56:17 +01:00
Douwe Maan 67ff47b39c Capitalize tab titles 2015-12-02 14:53:11 +01:00
Douwe Maan ed74fa73e2 Use consistent casing for page titles 2015-12-02 14:41:54 +01:00
Douwe Maan 275c2a3161 Use new style for wiki 2015-12-02 13:59:42 +01:00
Douwe Maan b6251af40f Fix feature spec. 2015-11-18 11:15:49 +01:00
Ben FordandDouwe Maan 3be9d2c422 Add ability to create directories in the editor
Simply type a name with a `/` directory separator and new directories
will be created. This does not do the fancy UI work that github.com
does, but it will get the job done.

I could not find tests for file creation, so I didn't add a test for
this slight behaviour modification. I did test directory traversals
though, using both absolute paths like `/tmp/foo.txt` and relative paths
like `../../foo.txt`. Neither case escaped the repository, though
attempting to traverse with a relative path resulted in a 500 error that
did not affect application stability upon reload.
2015-10-29 15:49:07 +01:00
Stan Hu d02d02c672 Fix error preventing displaying of commit data for a directory with a leading dot
Closes https://github.com/gitlabhq/gitlabhq/issues/8763
2015-10-12 22:24:19 -07:00
Stan Hu 0ab6ca93aa Add directory feature button
Change "+" icon under "Files" section to have three options:

* Create file
* Upload file
* New directory

Upload file is no longer accessible from the "Create file" page.
Users can now select a target branch in upload file as well.

Closes #2799: Fixes a bug where file modes were overwritten after a commit

Closes https://github.com/gitlabhq/gitlabhq/issues/8253: Existing files
can no longer be overwritten in the "Create file" section.

Closes #2557
2015-10-07 04:22:55 -07:00
Stan Hu d9af6f79ed Change the replace placeholder to use the filename
Dynamically adjust placedholder for uploads and fix Dropzone event handlers

Override error handler to prevent error messages from being inserted underneath image preview

Fix tests

Use regexp instead of startsWith for better browser compatibility

Remove duplicate code in _replace.html.haml and use one template

Remove files upon error and retain alert messages until user adds a new file
2015-09-15 13:07:32 -07:00
liyakun e2ece2bc35 Add "Replace" and "Upload" features
Refactor upload and replace functionality

    Rename file and move CSS

    Fix typo

    Make dropzone a div

    Remove unnecessary file

    Change color of "upload existing one"

    Add missing changes
2015-09-15 02:12:56 +02:00
Stan Hu 562242cb9d Fix commit data retrieval when branch name has single quotes
Closes #1724
2015-07-26 03:47:01 -07:00
Dmitriy Zaporozhets e05fbf0494 Fix creating file in new repo
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-08 17:41:59 +02:00
Robert Speicher 1f88d9b56f Remove "Multiselect Blob" feature specs
These are well covered by the new Jasmine tests, and faster!
2015-06-19 04:31:24 -04:00
Robert Speicher 4c42fc7c4c Call page.all instead of all in feature steps
There's a naming conflict between Capybara and rspec-matchers which both
define the `all` method.

See https://github.com/jnicklas/capybara/issues/1396
2015-06-12 05:12:42 -04:00
Robert Speicher 584f8601ef Change within to page.within in feature steps 2015-06-12 05:12:42 -04:00
Robert Speicher 69bbc413fe Update all should-style syntax to expect in features 2015-06-12 05:12:09 -04:00
Dmitriy Zaporozhets 7534d0ef46 Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-04-29 19:52:25 +03:00
Douwe Maan 1d829ca151 Fix tests. 2015-03-27 11:10:56 +01:00
Valery Sizov 3177693c6f WebEditor: save to new branch: spinach 2015-02-24 11:43:20 +02:00