summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Merge branch 'edit-on-fork' into 'master' Dmitriy Zaporozhets2015-12-246-149/+171
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Add tests for new functionalityDouwe Maan2015-12-211-1/+5
| | | | | |
| | * | | | Fix specs and behavior for LFS filesDouwe Maan2015-12-183-7/+15
| | | | | |
| | * | | | Automatically fork a project when not allowed to edit a file.Douwe Maan2015-12-186-148/+158
| | | | | |
| * | | | | Merge branch 'improve_emoji_picker' into 'master' Dmitriy Zaporozhets2015-12-231-1/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve emoji picker This request uses an emoji image sprite to show big set of emojis. The sprite has been made based one gemojione gem images. The categories are retrieved from https://github.com/jonathanwiesel/gemojione/blob/master/config/index.json as well. Some categories are pretty poor, it can be extended in the future. It's a first step on the way to improve picker. The first implementation was using https://github.com/iamcal/emoji-data project, but there was huge incompatibility with gemojione emojis set and I had to drop that solution. ![Screenshot_2015-12-22_23.26.27](/uploads/7d323eb0586204ac92915b41233b97ec/Screenshot_2015-12-22_23.26.27.png) See merge request !2172
| | * | | | | base implementation of emoji picker [ci skip]Valery Sizov2015-12-221-1/+0
| | | | | | |
| * | | | | | Make CI Lint form synchronousfix/ci-lintGrzegorz Bizon2015-12-221-1/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes `remote: true` from CI Lint form, making it synchronous form. This also removes some complexity related to displaying lint messages. View also has been updated, removed deprecated Bootstrap 2 tags. Improved design. Closes #4206
| * | | | | Merge branch 'admin_add_identity' into 'master' Robert Speicher2015-12-211-1/+16
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow admin to create new user identities Fixes #2442 See merge request !2077
| | * | | | | Allow admin to create new user identitiesDrew Blessing2015-12-151-1/+16
| | | | | | |
| * | | | | | Merge branch 'tduehr/gitlab-ce-cas-support'Douwe Maan2015-12-212-1/+30
| |\ \ \ \ \ \
| | * | | | | | add CAS authentication supporttduehr2015-12-142-1/+30
| | |/ / / / /
| * | | | | | Backport JIRA serviceDrew Blessing2015-12-181-2/+3
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'fix-merge-immediately' into 'master' Robert Speicher2015-12-161-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 'Merge Immediately' button Fixes #4125 See merge request !2117
| | * | | | | Fix 'Merge Immediately' buttonfix-merge-immediatelyDouwe Maan2015-12-161-1/+1
| | | | | | |
| * | | | | | Merge branch 'fix-endpoint-not-setting-var' into 'master' Douwe Maan2015-12-161-6/+3
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix endpoint not setting needed @ci_commit /cc @DouweM See merge request !2112
| | * | | | | Fix endpoint not setting needed @ci_commitZeger-Jan van de Weg2015-12-161-6/+3
| | | | | | |
| * | | | | | Merge remote-tracking branch 'origin/feature/update-rubocop'Dmitriy Zaporozhets2015-12-163-3/+4
| |\ \ \ \ \ \
| | * | | | | | Fixed Rubocop offensesGabriel Mazetto2015-12-153-3/+4
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'rs-issue-4032' into 'master' Douwe Maan2015-12-151-1/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix note polling Closes #4032 See merge request !2084
| | * | | | | Fix note pollingrs-issue-4032Robert Speicher2015-12-121-1/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | Closes #4032
| * | | | | Use a new admin runners path when reseting runners tokenGrzegorz Bizon2015-12-141-1/+1
| | | | | |
| * | | | | Merge branch 'master' into ci/persist-registration-tokenGrzegorz Bizon2015-12-1430-424/+185
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (66 commits) Fix runners admin view Fix migrations Rename mention of gitlab-git-http-server to gitlab-workhorse Bump Redis requirement to 2.8 for Sidekiq 4 requirements Fix wording on runner setup page add details on how to change saml button label Fix tests Move awards back to gray panel and few improvements to sidebar Few UI improvements to new sidebar implementation Fix tests for new issuable sidebar Update changelog Implement new sidebar for merge request page Make edit link on issuable sidebar works Redesign issue page for new sidebar Move awards css to separate file Implement issuable sidebar partial Update CHANGELOG Clarify cache behavior Run builds from projects with enabled CI Use Gitlab::Git instead of Ci::Git ... Conflicts: db/schema.rb
| | * \ \ \ \ Merge branch 'ci-project-migrate' into 'master' Kamil Trzciński2015-12-1425-325/+179
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | Fix after column renameKamil Trzcinski2015-12-111-1/+1
| | | | | | | |
| | | * | | | | Fix errorsKamil Trzcinski2015-12-111-3/+0
| | | | | | | |
| | | * | | | | Remove ci_ prefix from all ci related thingsKamil Trzcinski2015-12-116-14/+14
| | | | | | | |
| | | * | | | | Add runners tokenKamil Trzcinski2015-12-112-8/+1
| | | | | | | |
| | | * | | | | Migrate CI::Project to ProjectKamil Trzcinski2015-12-1124-315/+179
| | | | | | | |
| | * | | | | | Merge branch 'ci-services-migrate' into 'master' Kamil Trzciński2015-12-144-96/+5
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | / / / / | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | Ci Services migrate See merge request !1985
| | | * | | | Migrate CI::Services and CI::WebHooks to Services and WebHooksKamil Trzcinski2015-12-104-96/+5
| | | | | | |
| | * | | | | Implement new sidebar for merge request pageDmitriy Zaporozhets2015-12-112-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | display referenced merge requests in issue description with CI statusgsmethells/gitlab-ce-mr-statusesGreg Smethells2015-12-111-0/+1
| | |/ / / /
| * | | | | Add CI runners registration token reset buttonGrzegorz Bizon2015-12-111-0/+6
| |/ / / /
| * | | | Use devise paranoid mode and ensure the same message is returned every timeDrew Blessing2015-12-091-2/+4
| | | | | | | | | | | | | | | | | | | | Skipped CI because it has already passed. Had to rebase due to CHANGELOG.
| * | | | Give merge request widget the vars it desiresDouwe Maan2015-12-091-0/+5
| | | | |
| * | | | Merge branch 'master' into merge-if-greenDouwe Maan2015-12-095-20/+43
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/merge_requests_controller.rb # config/routes.rb
| | * | | | Fix only 20 group members showing on project member pageDmitriy Zaporozhets2015-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Merge branch 'mr-builds' into 'master' Dmitriy Zaporozhets2015-12-092-16/+31
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * \ \ \ Merge branch 'master' into mr-buildsDouwe Maan2015-12-083-9/+56
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/merge_requests_controller.rb # app/views/projects/merge_requests/widget/_heading.html.haml
| | | * | | | | Add Builds tab to MR detail pageDouwe Maan2015-12-081-12/+29
| | | | | | | |
| | | * | | | | Move commit builds to partialDouwe Maan2015-12-081-4/+4
| | | | | | | |
| | * | | | | | Merge branch 'edit-in-patch-branch' into 'master' Robert Speicher2015-12-082-3/+11
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default target branch to patch-n when editing file in protected branch Fixes #3441 See merge request !2021
| | | * | | | | Make tooltip less confusingDouwe Maan2015-12-081-1/+1
| | | | | | | |
| | | * | | | | Default target branch to patch-n when editing file in protected branchDouwe Maan2015-12-081-2/+10
| | | | | | | |
| * | | | | | | Merge branch 'master' into merge-if-greenDouwe Maan2015-12-083-2/+24
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/merge_requests/widget/_heading.html.haml # app/views/projects/merge_requests/widget/open/_accept.html.haml
| | * | | | | | Merge branch 'build-related-fixes' into 'master' Dmitriy Zaporozhets2015-12-083-2/+4
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | | Get ci_commit in MR controllerDouwe Maan2015-12-081-0/+2
| | | | | | | | |
| | | * | | | | | `builds_enabled` rather than `ci_enabled`Douwe Maan2015-12-082-2/+2
| | | | |/ / / / | | | |/| | | |
| | * | | | | | Merge branch 'languages-graph' into 'master' Robert Speicher2015-12-081-0/+20
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | Languages graph See merge request !2009
| | | * | | | | Implement languages graph pageDmitriy Zaporozhets2015-12-081-0/+20
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>