Commit Graph
649 Commits
Author SHA1 Message Date
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
Valery Sizov a48dd40a92 base implementation of emoji picker [ci skip] 2015-12-22 23:12:23 +02:00
Douwe Maan c910bca730 Add tests for new functionality 2015-12-21 11:57:51 +01:00
Drew Blessing f177aaa5fa Backport JIRA service 2015-12-18 14:19:48 -06: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
Robert Speicher b5230bbe7c Merge branch 'fix-merge-immediately' into 'master'
Fix 'Merge Immediately' button

Fixes #4125

See merge request !2117
2015-12-16 17:51:25 +00:00
Douwe Maan 9908da17c1 Merge branch 'fix-endpoint-not-setting-var' into 'master'
Fix endpoint not setting needed @ci_commit

/cc @DouweM

See merge request !2112
2015-12-16 16:39:35 +00:00
Douwe Maan 5843d09f07 Fix 'Merge Immediately' button 2015-12-16 17:38:58 +01:00
Zeger-Jan van de Weg 95c03f245f Fix endpoint not setting needed @ci_commit 2015-12-16 15:20:53 +01:00
Dmitriy Zaporozhets 40104746d6 Merge remote-tracking branch 'origin/feature/update-rubocop' 2015-12-16 13:44:50 +01:00
Douwe Maan 9451db3819 Merge branch 'rs-issue-4032' into 'master'
Fix note polling

Closes #4032

See merge request !2084
2015-12-15 13:18:13 +00:00
Gabriel Mazetto b5291f9599 Fixed Rubocop offenses 2015-12-15 00:53:52 -02: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
Robert Speicher 118d96906a Fix note polling
Closes #4032
2015-12-12 12:38:12 -05:00
Dmitriy Zaporozhets c6c244315a Implement new sidebar for merge request page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-11 20:11:23 +01:00
Kamil Trzcinski 73b04bebad Fix errors 2015-12-11 18:02:09 +01:00
Kamil Trzcinski 64bfd9d71a Remove ci_ prefix from all ci related things 2015-12-11 18:02:09 +01:00
Kamil Trzcinski e80e3f5372 Migrate CI::Project to Project 2015-12-11 18:02:09 +01:00
Greg Smethells 0272f27401 display referenced merge requests in issue description with CI status 2015-12-11 10:14:55 -06:00
Kamil Trzcinski 2988e1fbf5 Migrate CI::Services and CI::WebHooks to Services and WebHooks 2015-12-10 16:04:08 +01:00
Douwe Maan 28351806aa Give merge request widget the vars it desires 2015-12-09 09:59:30 +01:00
Douwe Maan eab086bde1 Merge branch 'master' into merge-if-green
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	config/routes.rb
2015-12-09 09:00:25 +01:00
Dmitriy Zaporozhets 9dd2674963 Fix only 20 group members showing on project member page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-09 01:43:57 +01:00
Dmitriy Zaporozhets 6213263d32 Merge branch 'mr-builds' into 'master'
Add Builds tab to MR detail page

## Before

![Screen_Shot_2015-12-08_at_13.21.04](/uploads/0d26060bef78f3de076e33439b8a4789/Screen_Shot_2015-12-08_at_13.21.04.png)

## After

![Screen_Shot_2015-12-08_at_13.25.20](/uploads/be7d7fd6d4fc8c5cc366b5b3778b813a/Screen_Shot_2015-12-08_at_13.25.20.png)

Fixes #3907

See merge request !2016
2015-12-09 00:05:23 +00:00
Robert Speicher e6668f8e34 Merge branch 'edit-in-patch-branch' into 'master'
Default target branch to patch-n when editing file in protected branch

Fixes #3441

See merge request !2021
2015-12-08 22:04:52 +00:00
Douwe Maan 8fb49a4b70 Merge branch 'master' into merge-if-green
# Conflicts:
#	app/views/projects/merge_requests/widget/_heading.html.haml
#	app/views/projects/merge_requests/widget/open/_accept.html.haml
2015-12-08 22:34:03 +01:00
Douwe Maan 57d71520bd Make tooltip less confusing 2015-12-08 22:30:40 +01:00
Douwe Maan 6c94a44295 Merge branch 'master' into mr-builds
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	app/views/projects/merge_requests/widget/_heading.html.haml
2015-12-08 22:26:29 +01:00
Dmitriy Zaporozhets 54d0ff982b Merge branch 'build-related-fixes' into 'master'
Build related UI fixes

## Before

![Screen_Shot_2015-12-08_at_13.15.21](/uploads/b72ed55da1f0ec953d2eb077fa4fbb18/Screen_Shot_2015-12-08_at_13.15.21.png)

## After

![Screen_Shot_2015-12-08_at_13.15.01](/uploads/144d8099e2724a51125e392dcbd43ed4/Screen_Shot_2015-12-08_at_13.15.01.png)


See merge request !2015
2015-12-08 17:06:11 +00:00
Robert Speicher befff32ecb Merge branch 'languages-graph' into 'master'
Languages graph

See merge request !2009
2015-12-08 16:56:39 +00:00
Douwe Maan df6750d3d6 Default target branch to patch-n when editing file in protected branch 2015-12-08 16:42:10 +01:00
Douwe Maan f39ff54290 Merge branch 'master' into zj/gitlab-ce-merge-if-green 2015-12-08 16:18:18 +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
Douwe Maan 75486f09c4 Merge branch 'master' into zj/gitlab-ce-merge-if-green 2015-12-08 13:43:45 +01:00
Douwe Maan 1567572e79 Add Builds tab to MR detail page 2015-12-08 13:11:41 +01:00
Douwe Maan a17ba43bfd Move commit builds to partial 2015-12-08 13:10:33 +01:00
Douwe Maan 9907a7e6ed Get ci_commit in MR controller 2015-12-08 13:06:55 +01:00
Douwe Maan 86a09cfaf1 builds_enabled rather than ci_enabled 2015-12-08 13:06:53 +01:00
Dmitriy Zaporozhets 9b561e7e15 Implement languages graph page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-08 02:35:34 +01:00
Dmitriy Zaporozhets 949a7e8e20 Merge branch 'report-ssl-errors' of https://gitlab.com/stanhu/gitlab-ce 2015-12-07 20:17:29 +01:00
Marin Jankovski e53b350cb6 Add specs for showing lfs object in UI. 2015-12-07 15:03:50 +01:00
Grzegorz Bizon 359d94607c Merge branch 'fix/award-emoji-conflict-in-notes' into 'master'
Fix problems with award-emoji-only comment

This fixes a conflict between note with only a single emoji in content
and award-emojis mechanisms.

Closes #3734 

cc @vsizov

See merge request !1936
2015-12-07 12:26:56 +00:00
Zeger-Jan van de Weg 0e96d6eb10 Merge branch 'master' into merge-if-green 2015-12-07 10:06:07 +01:00
Stan Hu a120b78940 Handle and report SSL errors in Web hook test. Check for status 200 for success.
If a Web hook test fails due to an SSL error or some other error, report
the result back to the user instead of an Error 500.

Closes #3656

Handle response
2015-12-04 07:13:28 -08:00
Douwe Maan a89d6d1428 Add authorization to new branch/tag pages. 2015-12-03 18:53:17 +01:00
Marin Jankovski ea52a81da4 Move the file serving to Raw controller, add a few ifs to view. 2015-12-03 17:08:09 +01:00
Marin Jankovski 0a081e7eff If a user clicks on the LFS object, it should be served if the user has access to the object. 2015-12-03 14:59:10 +01:00
Grzegorz Bizon a527f5c27f Notify user when award-emoji comment is invalid 2015-12-03 13:38:59 +01:00