An error occurred fetching the project authors.
- 26 Jul, 2016 1 commit
-
-
Douwe Maan authored
-
- 20 Jul, 2016 1 commit
-
-
Douwe Maan authored
-
- 19 Jul, 2016 2 commits
-
-
Connor Shea authored
-
Connor Shea authored
-
- 14 Jul, 2016 1 commit
-
- 12 Jul, 2016 2 commits
-
-
Valery Sizov authored
-
Paco Guzman authored
-
- 08 Jul, 2016 3 commits
-
-
Sean McGivern authored
1. Move render method to a concern, not a helper. 2. Let DiffHelper#diff_options automatically add the path option. 3. Move more instance var definitions to before filters.
-
Sean McGivern authored
When rendering a list of diff files, skip those where the diff is over 10 KB and provide an endpoint to render individually instead.
-
Paco Guzman authored
-
- 07 Jul, 2016 1 commit
-
-
Paco Guzman authored
We just need to get merge requests closes issues when we’re going to show them
-
- 06 Jul, 2016 5 commits
-
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Paco Guzman authored
Extract diff line data attributes to helper methods
-
Jacob Schatz authored
-
- 28 Jun, 2016 1 commit
-
-
Z.J. van de Weg authored
Depends on the changes in Workhorse (gitlab-org/gitlab-workhorse!48).
-
- 24 Jun, 2016 2 commits
-
-
Rémy Coutable authored
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: Rémy Coutable <remy@rymai.me>
-
Yorick Peterse authored
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.
-
- 23 Jun, 2016 2 commits
-
-
Paco Guzman authored
-
Z.J. van de Weg authored
-
- 16 Jun, 2016 2 commits
-
-
James Lopez authored
This reverts commit 13e37a3e.
-
James Lopez authored
-
- 15 Jun, 2016 2 commits
-
-
Z.J. van de Weg authored
-
Zeger-Jan van de Weg authored
-
- 14 Jun, 2016 2 commits
-
-
Phil Hughes authored
-
Phil Hughes authored
Added a button into the sidebar for issues & merge requests to allow users to manually create todo items Closes #15045
-
- 07 Jun, 2016 1 commit
-
-
Kamil Trzcinski authored
-
- 06 Jun, 2016 2 commits
-
-
Kamil Trzcinski authored
-
Kamil Trzcinski authored
-
- 03 Jun, 2016 4 commits
-
-
Zeger-Jan van de Weg authored
-
Kamil Trzcinski authored
-
James Lopez authored
This reverts commit 3e991230.
-
James Lopez authored
# Conflicts: # app/models/project.rb
-
- 02 Jun, 2016 1 commit
-
-
Kamil Trzcinski authored
-
- 01 Jun, 2016 1 commit
-
-
Sean McGivern authored
Set a `sha` parameter on the MR form. If this doesn't match the HEAD of the source branch when the form is submitted, show a warning (like with a merge conflict) and don't merge the branch.
-
- 31 May, 2016 1 commit
-
-
Felipe Artur authored
-
- 25 May, 2016 1 commit
-
-
Phil Hughes authored
Closes #17844
-
- 20 May, 2016 1 commit
-
-
Jeroen Jacobs authored
-
- 19 May, 2016 1 commit
-
-
ZJ van de Weg authored
[ci skip]
-