summaryrefslogtreecommitdiff
path: root/app/controllers/concerns/creates_commit.rb
Commit message (Collapse)AuthorAgeFilesLines
* Externalize strings in projects controllersMartin Wortschack2019-03-271-9/+16
| | | | | | | - concerns - dashboard - groups - import
* Revert "Merge branch 'blackst0ne-update-push-new-merge-request-url' into ↵Douwe Maan2018-11-071-1/+1
| | | | | 'master'" This reverts merge request !22526
* Update other linksblackst0ne2018-10-261-1/+1
|
* Enable frozen string in app/controllers/**/*.rbrepo-forks/gitlab-ce-frozen-string-app-controllergfyoung2018-09-181-1/+3
| | | | | | | | | | | | Enables frozen string for the following: * app/controllers/*.rb * app/controllers/admin/**/*.rb * app/controllers/boards/**/*.rb * app/controllers/ci/**/*.rb * app/controllers/concerns/**/*.rb Partially addresses #47424.
* Disable existing offenses for the CodeReuse copsYorick Peterse2018-09-111-0/+2
| | | | | This whitelists all existing offenses for the various CodeReuse cops, of which most are triggered by the CodeReuse/ActiveRecord cop.
* Allow maintainers to edit directly in a forkBob Van Landuyt2018-03-071-2/+6
|
* Move ModuleWithInstanceVariables to Gitlab namespaceLin Jen-Shin2017-11-221-9/+9
| | | | | And use .rubocop.yml to exclude paths we don't care, rather than using the cop itself to exclude.
* Use StrongMemoize and enable/disable cops properlyLin Jen-Shin2017-11-181-5/+11
|
* WIPLin Jen-Shin2017-11-061-4/+5
|
* Allow simple ivar ||= form. Update accordinglyLin Jen-Shin2017-09-191-1/+5
|
* Add cop to make sure we don't use ivar in a moduleLin Jen-Shin2017-09-181-0/+1
|
* Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-051-3/+2
|
* Split up MergeRequestsControllerdm-merge-request-creations-controllerDouwe Maan2017-06-281-1/+1
|
* Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-211-2/+2
|
* Revert 'New file from interface on existing branch'dm-revert-mr-8427Douwe Maan2017-06-091-5/+0
|
* Refactor changing files in web UIDouwe Maan2017-04-201-33/+29
|
* Fix cherry-picking or reverting through an MRDouwe Maan2017-03-021-33/+24
|
* Fix creating a file in an empty repo using the APIDouwe Maan2017-03-011-6/+1
|
* Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-231-2/+2
| | | | This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b.
* Prefer leading style for Style/DotPositionDouwe Maan2017-02-231-2/+2
|
* Fix code for copsDouwe Maan2017-02-231-7/+8
|
* Enable Style/ConditionalAssignmentDouwe Maan2017-02-231-3/+3
|
* Fix issue where files on a fork could not be editedDouwe Maan2017-02-171-12/+4
|
* Make sure different project gets a merge requestLin Jen-Shin2017-01-261-2/+4
| | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_21626479
* @tree_edit_project is no longer usedLin Jen-Shin2017-01-261-4/+1
| | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_21626434
* Rename from base to start because base could mean merge baseLin Jen-Shin2017-01-061-3/+3
|
* Detect if we really want a new merge request properlyLin Jen-Shin2017-01-061-2/+5
|
* Properly fix the edge case!Lin Jen-Shin2017-01-061-2/+15
|
* Rename source to base to avoid confusion from MRLin Jen-Shin2017-01-061-3/+3
|
* Don't set invalid @mr_source_branch when create_merge_request?Lin Jen-Shin2017-01-061-6/+3
|
* Fix for initial commit and remove unneeded argsLin Jen-Shin2017-01-061-3/+9
|
* Just trust set_commit_variables to set everything!Lin Jen-Shin2017-01-061-3/+1
| | | | | | | | Removing those weird setup in assign_change_commit_vars fixed all the failures in the tests. I still cannot say why but clearly we need to have better names. It's so confusing right now. We should seriously stop fiddling those instance variables.
* Merge request terms are reversed for GitOperationServiceLin Jen-Shin2017-01-051-4/+4
| | | | | | | | | | | This is seriously confusing but a target branch in merge request, is actually the source branch for GitOperationService, which is the base branch. The source branch in a merge request, is the target branch for GitOperationService, which is where we want to make commits. Perhaps we should rename source branch in GitOperationService to base branch, and target branch to committing branch.
* I think I am really confused, should be @tree_edit_projectLin Jen-Shin2017-01-051-1/+1
| | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_20571990
* Indent the way rubocop likesLin Jen-Shin2017-01-051-2/+2
|
* Merge branch 'master' into fix-git-hooks-when-creating-fileLin Jen-Shin2017-01-041-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (1031 commits) Add changelog entry for renaming API param [ci skip] Add missing milestone parameter Refactor issues filter in API Fix project hooks params Gitlab::LDAP::Person uses LDAP attributes configuration Don't delete files from spec/fixtures Copy, don't move uploaded avatar files Minor improvements to changelog docs Rename logo, apply for Slack too Fix Gemfile.lock for the octokit update Fix cross-project references copy to include the project reference Add logo in public files Use stable icon for Mattermost integration rewrite the item.respond_to?(:x?) && item.x? to item.try(:x?) API: extern_uid is a string Increases pipeline graph drowdown width in order to prevent strange position on chrome on ubuntu Removed bottom padding from merge manually from CLI because of repositioning award emoji's Make haml_lint happy Improve spec Add feature tests for Cycle Analytics ...
| * Fix redirect after update file when user has forked projectFelipe Artur2016-12-291-1/+1
| |
* | Try to use those @mr variables for full correctnessLin Jen-Shin2016-12-141-4/+6
| |
* | Fix source_project and also pass source_projectLin Jen-Shin2016-12-141-2/+2
| | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_19747556
* | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-101-4/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-hooks-when-creating-file * upstream/master: (60 commits) Refactor SSH keys docs Improvements to setting up ssh Do not reload diff for merge request made from fork when target branch in fork is updated Add 8.12.10, 8.12.11, and 8.12.12 CHANGELOG.md items Changes after review Fix broken test Adds CHANGELOG entry Adds tests Uniformize props name format Replace commit icon svg logic Replace play icon svg logic Update docs to reflect new defaults on omnibus Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security' Merge branch 'html-safe-diff-line-content' into 'security' Merge branch 'rs-filter-authentication_token' into 'security' Merge branch 'destroy-session' into 'security' remove unnecessary issues event filter on comments tab Updating reference to database password Add CHANGELOG entry Displays milestone remaining days only when it's present ...
| * Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security'Douwe Maan2016-12-081-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace MR access checks with use of MergeRequestsFinder Split from !2024 to partially solve https://gitlab.com/gitlab-org/gitlab-ce/issues/23867 :warning: - Potentially untested :bomb: - No test coverage :traffic_light: - Test coverage of some sort exists (a test failed when error raised) :vertical_traffic_light: - Test coverage of return value (a test failed when nil used) :white_check_mark: - Permissions check tested - [x] :bomb: app/finders/notes_finder.rb:17 - [x] :warning: app/views/layouts/nav/_project.html.haml:80 [`.count`] - [x] :bomb: app/controllers/concerns/creates_commit.rb:84 - [x] :traffic_light: app/controllers/projects/commits_controller.rb:24 - [x] :traffic_light: app/controllers/projects/compare_controller.rb:56 - [x] :vertical_traffic_light: app/controllers/projects/discussions_controller.rb:29 - [x] :white_check_mark: app/controllers/projects/todos_controller.rb:27 - [x] :vertical_traffic_light: app/models/commit.rb:268 - [x] :white_check_mark: lib/gitlab/search_results.rb:71 - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_267_266 Memoize ` merged_merge_request(current_user)` - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_248_247 Expected side effect for `merged_merge_request!`, consider `skip_authorization: true`. - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_269_269 Scary use of unchecked `merged_merge_request?` See merge request !2033
* | We still need it for empty repo for web UI!Lin Jen-Shin2016-12-081-1/+2
| | | | | | | | | | | | | | | | We shouldn't pass a non-existing branch to source_branch. Checkout test for: * spec/features/tags/master_views_tags_spec.rb:24 * spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb:13
* | We probably don't need this anymore, not sure whyLin Jen-Shin2016-12-081-2/+1
| |
* | Try if branch_exists? would work, feedback:Lin Jen-Shin2016-11-151-1/+1
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_18424135
* | @ref might not existLin Jen-Shin2016-11-151-1/+1
| |
* | Don't pass source_branch if it doesn't existLin Jen-Shin2016-11-151-1/+2
|/
* fixes distinction between renaming a file and updating its content and21092-file-execution-flag-is-not-preserved-when-editing-filestiagonbotelho2016-09-091-2/+1
| | | | refactors update file
* refactors update action to change commit_params with the correct pathtiagonbotelho2016-07-121-1/+0
|
* changes the usasge of path to file_path on blob_controller for ↵tiagonbotelho2016-07-121-1/+1
| | | | compatibillity with the create action
* removes debugging prints from codetiagonbotelho2016-07-121-8/+0
|
View Lorry Controller Status