Show only the commits that are newer in the merge request. #1263
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
+1 |
|
+1 |
|
+1 |
1 similar comment
|
+1 |
|
Very useful indeed. |
|
@randx would be great if this could make 2.8 |
ghost
assigned 
|
Great. I'll recheck it and merge. It will be part of 2.9 |
|
+1. Was nice working with you @dosire, @pascalvanhecke & Eugene! |
|
@randx Please let us know if you see any problems or things you want improved. @s-andringa I enjoyed working with you and @pascalvanhecke too! |
|
Tested. All seems ok. Thank you guys! |
dzaporozhets
added a commit
that referenced
this pull request
Aug 23, 2012
Show only the commits that are newer in the merge request.
|
@randx Awesome, thank you! |
|
nice :) |
dzaporozhets
added a commit
that referenced
this pull request
Mar 23, 2015
Fix dots in Wiki slug causing errors
### What does this MR do?
When a user enters in dots into the Wiki slug, an error occurs:
```
NoMethodError (undefined method `escaped_url_path' for nil:NilClass):
app/models/wiki_page.rb:172:in `set_attributes'
app/models/wiki_page.rb:191:in `save'
app/models/wiki_page.rb:155:in `update'
app/controllers/projects/wikis_controller.rb:49:in `update'
```
This MR fixes this problem.
### Are there points in the code the reviewer needs to double check?
See the problem below.
### Why was this MR needed?
The issue is that the `save` method gets called differently:
```ruby
def create(attr = {})
....
save :create_page, title, content, format, message
```
or
```ruby
def update(new_content = "", format = :markdown, message = nil)
...
save :update_page, @page, content, format, message
```
In the create case, title is the slug entered in by the user (e.g. `path/how-to-write-wiki-pages`).
In the update case, originally `@page.page` included the format extension (e.g.`path/how-to-write-wiki-pages.Markdown`). The method `page_title_and_dir` was trying to handle both cases and not doing the right thing. For example, calling `page_title_and_dir('test-1.2.3')` would result in:
```
path_title = test-1.2
path_dir = 3
```
### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?
Issues #1263, #431
This replaces !156
See merge request !419
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
This will help with a common request, see https://github.com/gitlabhq/gitlabhq/issues/893 and https://github.com/gitlabhq/gitlabhq/issues/1214
Please let me know if you want us to add/change anything.
This was made during an Amsterdam.rb hack night with Pascal, Eugene and Sjoerd.