Commit Graph
397 Commits
Author SHA1 Message Date
Grzegorz Bizon 9e6190485b Parse XML instead of HTML in tests for a SVG build badge 2016-02-11 10:29:15 +01:00
Grzegorz Bizon debaa81329 Move build badge specs to badges directory 2016-02-11 10:29:15 +01:00
Grzegorz Bizon d51e8e1b77 Inherit build badge access permissions from project 2016-02-11 10:29:15 +01:00
Grzegorz Bizon 29f2600ab6 Improve build badge tests, add another test case 2016-02-11 10:29:14 +01:00
Grzegorz Bizon cf0eab5047 Add feature tests for builds status badge 2016-02-11 10:29:14 +01:00
Douglas Barbosa Alexandre 1353cff5fe Replaces "Create merge request" link with one to the MR when one exists 2016-02-10 10:32:25 -02:00
Kamil Trzcinski d231b6b918 Add behaviour tests for build permissions 2016-02-04 13:13:01 +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
Phil Hughes 5a04fc9099 Added tests to emoji search field focus 2016-01-29 12:58:34 +00:00
Dmitriy Zaporozhets 88e16c3d19 Merge branch 'issue_2406' into 'master'
Show list of forks for a given Project

Closes #2406

See merge request !2376
2016-01-28 16:58:38 +00:00
Dmitriy Zaporozhets 3f6bb7bc86 Merge branch 'issue_5546' into 'master'
Save list sort in a cookie

Closes #5546 

See merge request !2537
2016-01-28 16:21:04 +00:00
Douwe Maan 8ab939c2c0 Merge branch 'ci/test-build-artifacts-scripts' into 'master'
Add tests for clicking a row in build artifacts browser

This adds a feature tests for clicking a row, which is handled by javascript event.

/cc @ayufan 

See merge request !2551
2016-01-26 13:32:00 +00:00
Rubén Dávila c3c92c7317 Make default sorting preference work for Issues and MRs. 2016-01-22 18:43:21 -05:00
Rubén Dávila 9ef468922c Merge branch 'master' into issue_5546 2016-01-22 17:54:37 -05:00
Rubén Dávila 7c520c7803 Make sorting preference reusable for all projects. 2016-01-22 17:00:35 -05:00
Grzegorz Bizon b75f6c68e5 Add tests for clicking a row in build artifacts browser 2016-01-22 11:42:29 +01:00
Rubén Dávila 0f79620ccb Little refactor plus some specs. 2016-01-21 12:54:10 -05:00
Rémy Coutable 8a829c9738 Merge remote-tracking branch 'origin/master' into fix-comment-on-diff-ajax-loading 2016-01-20 22:42:07 +01:00
Douwe Maan b4faa59728 Merge branch 'issue_3749' into 'master'
Update Issues/MRs updated_at field when notes are generated

Closes #3749 and #9130

See merge request !2493
2016-01-20 15:06:49 +00:00
Rubén Dávila 99679bc6a0 Add specs for Forks listing. 2016-01-20 00:17:21 -05:00
Rémy Coutable 491c2248c0 Fix diff comments loaded by AJAX to load comment with diff in discussion tab
This commits also fixes two minor issues:
- Ensure notes that the current user is not allowed to see are not
  returned in the AJAX notes loading
- Ensure the notes counter badge is decremented of 1 instead of 2
2016-01-19 18:22:01 +01:00
Douwe Maan f6e14431a0 Merge branch 'feature/expose-ci-lint-tool' 2016-01-19 11:52:20 +01:00
Rubén Dávila 78754cb1c9 Update Issues/MRs updated_at when user leaves comments. 2016-01-18 21:39:23 -05:00
Grzegorz Bizon 13f0ea12e3 Improve ux in builds artifacts browser 2016-01-18 19:58:16 +01:00
Grzegorz Bizon 6fe33804dc Remove dropdown containing CI Lint button on builds page
Link to CI Lint on builds page will be a separate button from now on.
2016-01-18 08:12:31 +01:00
Grzegorz Bizon 7506afe14b Update build artifacts feature tests 2016-01-17 18:13:45 +01:00
Grzegorz Bizon d9629a0cf0 Add specs for CI Lint button exposed on a builds page 2016-01-17 16:57:42 +01:00
Grzegorz Bizon 6a504c8256 Add feature tests for permissions for build artifacts read ability 2016-01-15 13:56:43 +01:00
Grzegorz Bizon b7bb56c7a3 Expand builds namespace for feature tests in spinach 2016-01-15 13:09:20 +01:00
Douglas Barbosa Alexandre aac6598482 Relax constraints for wiki slug
Since GitHub doesn’t apply these constraints to theirs wiki slug
allowing characters like `,`, `:`, `*`, etc, we need to relax our
constraints or some wiki pages will not be available after they were
imported.

For an example the Devise project have a wiki page with the following
slug: “How To: Add sign_in, sign_out, and sign_up links to your layout
template”
2016-01-14 12:09:31 -02:00
Grzegorz Bizon 6d7a77074f Add specs for endpoint meant to be accelerated by workhorse 2016-01-14 12:48:16 +01:00
Grzegorz Bizon cde455c4e6 Add encoding feature tests for builds artifacts browser 2016-01-14 12:48:16 +01:00
Grzegorz Bizon 09c82c6fdc Add spinach feature specs for build artifacts browser 2016-01-14 12:48:15 +01:00
Grzegorz Bizon e5d2a81b86 Add basic spinach tests for project builds 2016-01-14 12:48:15 +01:00
Rémy Coutable 5e452d3794 Improve & adds specs for Issue/MR references
- Improve specs for private Issue/MR referenced in public Issue
- Add specs for private Issue/MR referenced in public MR
2016-01-13 17:05:54 +01:00
Rémy Coutable 9d7f88c122 Show referenced MRs & Issues only when the current viewer can access them 2016-01-13 11:59:10 +01:00
Dmitriy Zaporozhets 0456855911 Add CHANGELOG item and tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-07 15:16:11 +01:00
Jacob Vosmaer 41b8a238ce Merge branch 'master' of github.com:gitlabhq/gitlabhq 2016-01-07 12:56:18 +01:00
Josh Frye edd2ce3836 Change text back. Add additional tests. 2016-01-03 18:12:27 -05:00
Josh FryeandJosh Frye 796c11e9a7 Remove feature tag from testing locally 2016-01-03 18:12:27 -05:00
Josh FryeandJosh Frye 8bfc46451e Show 'New Merge Request' buttons on canonical repo. 2016-01-03 18:12:27 -05:00
Valery Sizov e1a47bd123 Merge branch 'emoji_picker_frequently_used' into 'master'
Emoji picker: add "frequently used" category

depend on !2172

![Screen_Shot_2015-12-24_at_16.39.04](/uploads/7117173c6f519282054bcb1b7ba248f4/Screen_Shot_2015-12-24_at_16.39.04.png)


See merge request !2180
2015-12-24 15:58:32 +00:00
Dmitriy Zaporozhets aa712e2b36 Merge branch 'new-project-header-redesign' into 'master'
Dropdowns for clone. Star and Fork with new count areas. Star and Unstarred Works now

Fixes #2876 and #3482
Used existing styles. <br/>
Did not attempt to make pixel perfect as styles already exist. <br/>

![Screen_Shot_2015-12-18_at_5.24.56_PM](/uploads/a79ba1e0be0232f2aeef8a43f3253479/Screen_Shot_2015-12-18_at_5.24.56_PM.png)

See merge request !2156
2015-12-24 14:17:11 +00:00
Valery Sizov 5ed1256492 Merge branch 'emoji-picker-search' into emoji_picker_frequently_used 2015-12-24 15:06:51 +02:00
Valery Sizov 44cf1cbaaf Merge remote-tracking branch 'origin/master' into emoji-picker-search 2015-12-24 14:57:07 +02:00
Dmitriy Zaporozhets 76b7e24f85 Merge branch 'edit-on-fork' into 'master'
Automatically fork a project when not allowed to edit a file.

Fixes #3215.

To do:

- [ ] Add tests

-----

## "Edit" button on file in a project the user does NOT have write access to

![edit_file](/uploads/7602157420768aef483a6586bba2d164/edit_file.png)

## Clicking will automatically create a fork

![during_fork](/uploads/32f4f5dff9f24ea99522000b0bf881c5/during_fork.png)

## When the fork has been created, the user is returned to the edit page on the original project with a notice

![edit_notice](/uploads/94ed1319404370ff1e9c0d672fb41e03/edit_notice.png)

## The user cannot change the target branch and is informed that editing will start an MR

![edit_footer](/uploads/4da68d4795c7177e575b7c434d16eeae/edit_footer.png)

## Hitting "Commit changes" will commit and start an MR from my fork to the origin project

![Screen_Shot_2015-12-17_at_23.38.08](/uploads/d777a4db6f38a5a1be84031694465bc1/Screen_Shot_2015-12-17_at_23.38.08.png)

-----

## "Create file, "Upload file" and "New directory" buttons in a project the user does NOT have write access to

![new_directory](/uploads/72f556248f30d6652523bbb4be01b3e0/new_directory.png)

## Clicking any of these options will automatically create a fork

![during_fork](/uploads/32f4f5dff9f24ea99522000b0bf881c5/during_fork.png)

## When the fork has been created, the user is returned to the tree page on the original project with a notice

![new_directory_notice](/uploads/a1a3e11308ae0e8f0913fae6813a37ed/new_directory_notice.png)

## Clicking "New directory" again will show the modal. The user cannot change the target branch and is informed that editing will start an MR

![new_dir](/uploads/99ca8cbfb2f70603e352b3fdf67b6281/new_dir.png)

## Hitting "Create directory" will commit and start an MR from my fork to the origin project

![Screen_Shot_2015-12-17_at_23.39.19](/uploads/3713d0235abf831361b803a6198c5bc1/Screen_Shot_2015-12-17_at_23.39.19.png)

cc @dzaporozhets @skyruler

See merge request !2145
2015-12-24 12:24:57 +00:00
Douwe Maan 6b968a8fcd Merge branch 'branch-invalid-name' into 'master'
Add JS validation for invalid characters  in branch name

Fixes #3293 

Demo:

![out-1080p](/uploads/ba21c359b6b8b440c40cacf772ec0df7/out-1080p.gif)


See merge request !2122
2015-12-24 11:42:25 +00:00
Douwe Maan 541da4d51f Merge branch 'issue_4189' into 'master'
Fix redirect to wrong URL when merging and MR detail URL has an anchor.

Closes #4189

See merge request !2169
2015-12-24 11:41:36 +00:00
Valery Sizov 999a374f77 Merge branch 'emoji-picker-search'into emoji_picker_frequently_used 2015-12-24 13:38:17 +02:00
Valery Sizov 5da8c1f77a fixes after review 2015-12-24 11:57:46 +02:00