- 30 6月, 2016 1 次提交
-
-
由 Connor Shea 提交于
-
- 28 6月, 2016 12 次提交
-
-
由 Annabel Dunstone 提交于
-
由 Annabel Dunstone 提交于
-
由 winniehell 提交于
-
由 James Lopez 提交于
-
由 http://jneen.net/ 提交于
-
由 http://jneen.net/ 提交于
-
由 http://jneen.net/ 提交于
paired with @stanhu
-
由 Ruben Davila 提交于
This fix avoids exposing the information from the wiki repository of other project.
-
由 Douwe Maan 提交于
-
由 Annabel Dunstone 提交于
-
由 Annabel Dunstone 提交于
-
由 Phil Hughes 提交于
-
- 27 6月, 2016 3 次提交
-
-
由 winniehell 提交于
-
由 Connor Shea 提交于
Add max-height to prevent images from displaying larger than the provided screen size. Also fix a failing test and add a new one.
-
由 Connor Shea 提交于
-
- 26 6月, 2016 1 次提交
-
-
由 Takuya Noguchi 提交于
-
- 25 6月, 2016 6 次提交
-
-
由 Simon Welsh 提交于
-
由 Simon Welsh 提交于
-
由 Ruben Davila 提交于
This will avoid application errors generated by the assumption of the presence of these params.
-
由 Felipe Artur 提交于
-
由 Felipe Artur 提交于
-
由 Rémy Coutable 提交于
Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_merge_if_build_succeeds are true The issue was that `MergeRequest#mergeable?` returns false when the CI state is not success and project.only_allow_merge_if_build_succeeds is true. In this case `Projects::MergeRequestsController#merge` would return the `:failed` status when enabling `merge_when_build_succeeds`, thus leading to a weird state and the MR never automatically merged. The fix is to disable the CI state check in the controller safeguard that early return the `:failed` status. Signed-off-by: NRémy Coutable <remy@rymai.me>
-
- 24 6月, 2016 17 次提交
-
-
由 Rémy Coutable 提交于
The issue was with the `User#groups` and `User#projects` associations which goes through the `User#group_members` and `User#project_members`. Initially I chose to use a secure approach by storing the requester's user ID in `Member#created_by_id` instead of `Member#user_id` because I was aware that there was a security risk since I didn't know the codebase well enough. Then during the review, we decided to change that and directly store the requester's user ID into `Member#user_id` (for the sake of simplifying the code I believe), meaning that every `group_members` / `project_members` association would include the requesters by default... My bad for not checking that all the `group_members` / `project_members` associations and the ones that go through them (e.g. `Group#users` and `Project#users`) were made safe with the `where(requested_at: nil)` / `where(members: { requested_at: nil })` scopes. Now they are all secure. Signed-off-by: NRémy Coutable <remy@rymai.me>
-
由 Yorick Peterse 提交于
This commit changes the way certain documents are rendered (currently only Notes) and how documents are redacted. Previously both rendering and redacting would run on a per document basis. The result of this was that for every document we'd have to run countless queries just to figure out if we could display a set of links or not. This commit changes things around so that redacting Markdown documents is no longer tied into the html-pipeline Gem. This in turn allows it to redact multiple documents in a single pass, thus reducing the number of queries needed. In turn rendering issue/merge request notes has been adjusted to take advantage of this new setup. Instead of rendering Markdown somewhere deep down in a view the Markdown is rendered and redacted in the controller (taking the current user and all that into account). This has been done in such a way that the "markdown()" helper method can still be used on its own. This particular commit also paves the way for caching rendered HTML on object level. Right now there's an accessor method Note#note_html which is used for setting/getting the rendered HTML. Once we cache HTML on row level we can simply change this field to be a column and call a "save" whenever needed and we're pretty much done.
-
由 James Lopez 提交于
-
由 James Lopez 提交于
Fix tmp file being deleted after the request plus some cleanup and improved erroring for this situation
-
由 Connor Shea 提交于
-
由 Annabel Dunstone 提交于
-
由 Annabel Dunstone 提交于
-
由 Annabel Dunstone 提交于
-
由 Alfredo Sumaran 提交于
-
由 Alfredo Sumaran 提交于
-
由 Alfredo Sumaran 提交于
-
由 Paco Guzman 提交于
-
由 Z.J. van de Weg 提交于
This commit eager loads the award emoji on both the issues and the MRs. When loading an issue with 108 comments this reduces the query count by 327 queries. On a merge request with the same amount of comments this saves 148 queries. The large difference is not clear to me at this point and the total query count is still huge with 387 and 1034 respectively. The biggest problem however, remains the calculation of participants.
-
由 Connor Shea 提交于
-
由 Connor Shea 提交于
-
由 Alfredo Sumaran 提交于
-
由 Connor Shea 提交于
-