Commit Graph
1175 Commits
Author SHA1 Message Date
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
Jacob Schatz 6592bfbb9e Moves star code to a class 2015-12-23 20:36:29 -05:00
Jacob Schatz 7ba4482fcf fixes failing test by updating project clone instructions 2015-12-23 19:57:30 -05:00
Jacob Schatz 69f9bf77d4 spinach tests will pass now 2015-12-23 12:26:50 -05:00
Valery Sizov efe98067da emoji picker search 2015-12-23 13:08:47 +02:00
Valery Sizov bfe905b3ae add some spinach 2015-12-22 23:12:23 +02:00
Valery Sizov 0ae0881250 fix specs 2015-12-22 23:12:23 +02:00
Valery Sizov 791c5bff7d add some spinach 2015-12-22 19:47:38 +02:00
Valery Sizov bc9467cc08 fix specs 2015-12-22 19:39:15 +02:00
Rubén Dávila 42da7cd375 Fix redirect to wrong URL when merging and MR detail URL has an anchor. #4189 2015-12-21 22:59:15 -05:00
Douglas Barbosa Alexandre 23b436dc93 Fix minor stylistic complaints 2015-12-21 22:21:10 -02:00
Douwe Maan cfa716ebe0 Fix spec 2015-12-21 12:15: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
Drew Blessing f177aaa5fa Backport JIRA service 2015-12-18 14:19:48 -06:00
Douwe Maan 1b9e2530de Merge branch 'master' into edit-on-fork
# Conflicts:
#	app/views/projects/tree/_tree_header.html.haml
2015-12-18 17:15:05 +01:00
Douwe Maan f4f4a6b530 Fix specs and behavior for LFS files 2015-12-18 16:14:12 +01:00
Douglas Barbosa Alexandre 95a67cdbcf Merge branch 'master' into branch-invalid-name 2015-12-18 11:46:10 -02:00
Douwe Maan d9c82d679f Automatically fork a project when not allowed to edit a file. 2015-12-18 10:03:34 +01:00
Douglas Barbosa Alexandre 1757e6ef65 Add JS validation for invalid characters in branch name
More info about valid ref names:

https://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.ht
ml
2015-12-17 17:17:37 -02:00
Rubén Dávila a4e0c7c7d6 Upgrade Poltergeist to 1.8.1. #4131 2015-12-17 01:01:08 -05:00
Douglas Barbosa Alexandre 9c266d4935 Add more descriptive error message when create branch with invalid name 2015-12-16 16:34:03 -02:00
Douwe Maan 18e1929ff8 Fix spec 2015-12-16 17:07:02 +01:00
Douwe Maan 79c90821ac Rename .issuable-details to .detail-page (and -header and -description) 2015-12-16 16:13:22 +01:00
Douwe Maan 41d6b3701e Merge branch 'master' into fix-milestone-snippet-header 2015-12-16 15:56:23 +01:00
Douwe Maan 4df8477afc Fix tests 2015-12-16 14:35:01 +01:00
Dmitriy Zaporozhets 40104746d6 Merge remote-tracking branch 'origin/feature/update-rubocop' 2015-12-16 13:44:50 +01:00
Grzegorz BizonandGrzegorz Bizon 9470d05c70 Add spinach test for note polling
This also increases capybara timeout to 15 seconds (note polling
interval). Capybara will look for new note for this period of time.
2015-12-15 14:19:35 +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
Grzegorz Bizon 9d2b8326b2 Update commits spinach tests related to displaying build status 2015-12-14 14:25:18 +01:00
Kamil Trzciński c810234357 Merge branch 'ci-project-migrate' into 'master'
Ci Project migrate

- This doesn't migrate: allow_git_fetch, coverage_regex, timeout. Since this are project configuration settings I would propose to migrate them to `.gitlab-ci.yml`.
- This requires offline migrations.
- It simplifies database models making all CI objects to be attached to: Project.
- It removes Ci::Project, but makes /ci/projects working by adding method: Project.find_by_ci_id for backward compatibility (badges, triggers).
- We should add default `timeout` to Application Settings.
- It misses specs.
- It is based on ci-services-migrate for now.
- It removes CI events.
- It removes administrator CI projects overview.
- It removes CI application settings.

In 8.4 or 8.5 we can remove redundant tables and columns.


See merge request !1987
2015-12-14 10:35:40 +00:00
Kamil Trzciński e81ae1e68c Merge branch 'ci-services-migrate' into 'master'
Ci Services migrate



See merge request !1985
2015-12-14 10:32:57 +00:00
Kamil Trzcinski e80e3f5372 Migrate CI::Project to Project 2015-12-11 18:02:09 +01:00
Douglas Barbosa Alexandre 1f893022fd Remove note from MR discussion when deleting it in the changes tab 2015-12-10 22:07:25 -02:00
Robert Speicher 3f4715322e Merge branch 'fix-edit-notes-on-merge-request-diff' into 'master'
Fix editing notes on a merge request diff

Fixes #3910

See merge request !2041
2015-12-10 19:22:53 +00:00
Kamil Trzcinski c4fa894de2 Fix specs 2015-12-10 16:16:34 +01:00
Kamil Trzcinski 2988e1fbf5 Migrate CI::Services and CI::WebHooks to Services and WebHooks 2015-12-10 16:04:08 +01:00
Dmitriy Zaporozhets d7044c5ccf Merge branch 'move-network' 2015-12-09 22:21:56 +01:00
Dmitriy Zaporozhets 7a4d468576 Merge remote-tracking branch 'origin/mr-broken'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-09 21:06:04 +01:00
Douglas Barbosa Alexandre 4a29669dec Merge branch 'master' into fix-edit-notes-on-merge-request-diff 2015-12-09 16:31:15 -02:00
Robert Speicher b255aad2d2 Merge branch 'rs-default-clone-fixes' into 'master'
Simplify shared User SSH key steps

See merge request !2043
2015-12-09 18:27:18 +00:00