13 Sep, 2013
1 commit
11 Sep, 2013
2 commits
-
When viewing the diff for a changed image file, two bugs occur: - Both the 'before' and 'after' images link to the 'after' commit - Visiting the link for either image will cause a error The first is caused by both image links referencing '@commit.id' rather than '@commit.parent_id'. The second is caused by the use of 'project_tree_path' which is used for creating links to directories in the git file tree. 'project_blob_path' which links to files should be used instead.
07 Sep, 2013
1 commit
-
Previously, only number of changed files mattered. Now, number of lines to render in the diff are also taken into account. A hard limit is set, above which diffs are not rendered and users are not allowed to override that. This prevents high server resource usage with huge commits. Related to #1745, #2259 In addition, handle large commits for MergeRequests and Compare controllers. Also fixes a bug where diffs are loaded twice, if user goes directly to merge_requests/:id/diffs URL.
21 Aug, 2013
1 commit
08 Aug, 2013
2 commits
17 Jul, 2013
6 commits
-
-Form was for @source_project rather then @project. -add spinach test for edit submission on forked project Change-Id: I807a5077608b7e910f4bc83c5d3e82c378f70a9e
-
-Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
-
-Removed many extra spaces I added -Fixed email templates to be consistent/better looking GITLAB-894, GITLAB-895, (GITLAB-858) Change-Id: I35c1a8e0e22af7de26d54e5c3da987fa7bb3921e
-
Wasn't setting fields so validations would fail Change-Id: I0363c57bf6c8b9937cc1b4140d09071d7c5168c2
-
-Disable observers post test run -Allow db:seed_fu RAILS_ENV=test to be run more than once without error -fix diffs_in_between, was passing in the default_options for grit, but grit in this case doesn't take options, fixed the test to actually fail if the incorrect diffs are returned -make notes/commits render against proper project -MR discussion file links should reference note's project -Added tests for commit links on edit merge request -fixes edit issues (canceling an edited mr, updating an edited mr) -updates tests with checks for source code updates -still forked_merge_requests.feature (project_forked_merge_requests) test not passing (commented out -- "stable" not being set) MR API: error on bad target_project -If the target project id is specified and it is not the same as the project the request is being made on (the source), and the it isn't a fork of that project, error out, otherwise use it as the target -Fixes some busted (but hidden) test cases Conflicts: app/views/merge_requests/show/_diffs.html.haml spec/features/notes_on_merge_requests_spec.rb Change-Id: I20e595c156d0e8a63048baaead7be6330c738a05
-
The good: - You can do a merge request for a forked commit and it will merge properly (i.e. it does work). - Push events take into account merge requests on forked projects - Tests around merge_actions now present, spinach, and other rspec tests - Satellites now clean themselves up rather then recreate The questionable: - Events only know about target projects - Project's merge requests only hold on to MR's where they are the target - All operations performed in the satellite The bad: - Duplication between project's repositories and satellites (e.g. commits_between) (for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos) Fixes: Make test repos/satellites only create when needed -Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap) -project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually -fixed remote removal -How to merge renders properly -Update emails to show project/branches -Edit MR doesn't set target branch -Fix some failures on editing/creating merge requests, added a test -Added back a test around merge request observer -Clean up project_transfer_spec, Remove duplicate enable/disable observers -Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well -Signifant speed ups for tests -Update formatting ordering in notes_on_merge_requests -Remove wiki schema update Fixes for search/search results -Search results was using by_project for a list of projects, updated this to use in_projects -updated search results to reference the correct (target) project -udpated search results to print both sides of the merge request Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
22 Jun, 2013
1 commit
19 Jun, 2013
1 commit
12 Jun, 2013
1 commit
05 Jun, 2013
1 commit
04 Jun, 2013
2 commits
-
Conflicts: Gemfile.lock app/models/ability.rb app/models/project.rb app/views/snippets/_form.html.haml db/schema.rb features/steps/shared/paths.rb spec/factories.rb spec/models/project_spec.rb
24 May, 2013
1 commit
19 May, 2013
1 commit
13 May, 2013
1 commit
09 May, 2013
1 commit
06 May, 2013
1 commit
03 May, 2013
1 commit
-
Internally public projects
02 May, 2013
2 commits
-
updated fork feature to use gitlab-shell for v5 of gitlab
-
Public projects listed in the public section will be linked to the actual project's page. Public projects now give any user Guest permissions to the project, allowing them to download the code, read and create issues, and view anything else in the project's pages. Ample access tests have been added to the project_access_spec to verify correct permissions and behavior on public projects. - Visitors to the site who are not logged in still cannot view the project's pages. - Logged-in users visiting a public project where they are not a team member can create issues, but not snippets. They can view the projects code, issues, merge requests, etc, just as if they were a Guest member of the project. - Since this is a public project, the user is also granted :download_code permissions, a permission normally reserved for Reporters, since they can clone the repo anyways and browse commits and branches locally.
25 Apr, 2013
1 commit
15 Apr, 2013
1 commit
12 Apr, 2013
1 commit
10 Apr, 2013
1 commit
24 Mar, 2013
1 commit
19 Mar, 2013
2 commits
-
The Cancel button on the Edit Wiki page was still redirecting back to the "Index" page which is no longer the default Wiki page. This commit changes the Cancel button in the following ways: * Pressing Cancel while editing an existing Wiki page will now redirect you back to the latest version of that page. * Pressing Cancel while editing a brand new Wiki home page that does not yet exist will redirect you to back to the same Edit Wiki Home page.
18 Mar, 2013
1 commit
15 Mar, 2013
2 commits
-
Conflicts: app/views/layouts/project_resource.html.haml app/views/wikis/edit.html.haml app/views/wikis/pages.html.haml app/views/wikis/show.html.haml spec/features/gitlab_flavored_markdown_spec.rb
14 Mar, 2013
2 commits
13 Mar, 2013
1 commit