summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'markdown-plantuml' into 'master' Sean McGivern2017-02-039-8/+115
|\
| * PlantUML support for MarkdownHoracio Sanson2017-02-039-8/+115
* | Merge branch 'squash' into 'master' Sean McGivern2017-02-0313-28/+75
|\ \
| * | Backport changes from EE squashSean McGivern2017-02-0313-28/+75
* | | Merge branch 'fwn-to-find-by-full-path' into 'master' Dmitriy Zaporozhets2017-02-0322-32/+32
|\ \ \
| * | | replace `find_with_namespace` with `find_by_full_path`Adam Pahlevi2017-02-0322-32/+32
* | | | Merge branch '24606-force-password-reset-on-next-login' into 'master'Sean McGivern2017-02-034-0/+14
|\ \ \ \ | |_|/ / |/| | |
| * | | Update api docs and minor changesGeorge Andrinopoulos2017-02-022-2/+4
| * | | Force new password after password reset via APIGeorge Andrinopoulos2017-02-023-0/+12
* | | | Merge branch 'update-installation-docs' into 'master' Stan Hu2017-02-032-0/+139
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update installation docs to include Docker, othersupdate-installation-docsCindy Pallares2017-02-022-0/+139
* | | | Merge branch 'fix-git-hooks-when-creating-file' into 'master' Douwe Maan2017-02-0241-439/+906
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...fix-git-hooks-when-creating-fileLin Jen-Shin2017-02-02426-2058/+4651
| |\ \ \ \
| * | | | | Make sure different project gets a merge requestLin Jen-Shin2017-01-261-2/+4
| * | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-26157-284/+324
| |\ \ \ \ \
| * | | | | | Try to check if branch diverged explicitlyLin Jen-Shin2017-01-261-6/+13
| * | | | | | We don't care about the return value nowLin Jen-Shin2017-01-261-1/+1
| * | | | | | Make GitHooksService#execute return block valueLin Jen-Shin2017-01-262-8/+4
| * | | | | | Use commit rather than branch, and rename to avoid confusionLin Jen-Shin2017-01-261-8/+8
| * | | | | | @tree_edit_project is no longer usedLin Jen-Shin2017-01-261-4/+1
| * | | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-261415-9306/+37427
| |\ \ \ \ \ \
| * | | | | | | Fix renamingLin Jen-Shin2017-01-076-9/+9
| * | | | | | | Rename from base to start because base could mean merge baseLin Jen-Shin2017-01-0611-91/+91
| * | | | | | | 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-0611-91/+91
| * | | | | | | Don't set invalid @mr_source_branch when create_merge_request?Lin Jen-Shin2017-01-061-6/+3
| * | | | | | | Prefer leading dots over trailing dotsLin Jen-Shin2017-01-062-4/+4
| * | | | | | | Fix for initial commit and remove unneeded argsLin Jen-Shin2017-01-063-7/+18
| * | | | | | | Just trust set_commit_variables to set everything!Lin Jen-Shin2017-01-063-9/+6
| * | | | | | | Prefer leading dots over trailing dotsLin Jen-Shin2017-01-052-6/+6
| * | | | | | | Merge request terms are reversed for GitOperationServiceLin Jen-Shin2017-01-051-4/+4
| * | | | | | | I think I am really confused, should be @tree_edit_projectLin Jen-Shin2017-01-051-1/+1
| * | | | | | | Remove tag with git hooksLin Jen-Shin2017-01-054-12/+26
| * | | | | | | Introduce Repository#with_repo_branch_commitLin Jen-Shin2017-01-053-33/+28
| * | | | | | | Indent the way rubocop likesLin Jen-Shin2017-01-053-5/+5
| * | | | | | | Update the comment:Lin Jen-Shin2017-01-041-3/+5
| * | | | | | | Prefer leading dots over trailing dotsLin Jen-Shin2017-01-041-2/+2
| * | | | | | | Add a comment to explain why newrev should be updatedLin Jen-Shin2017-01-041-1/+3
| * | | | | | | Merge branch 'master' into fix-git-hooks-when-creating-fileLin Jen-Shin2017-01-041604-8380/+37863
| |\ \ \ \ \ \ \
| * | | | | | | | Try to use those @mr variables for full correctnessLin Jen-Shin2016-12-141-4/+6
| * | | | | | | | Use ArgumentError error instead because it's a bugLin Jen-Shin2016-12-141-4/+4
| * | | | | | | | Use branch_exists? to check branchesLin Jen-Shin2016-12-141-2/+2
| * | | | | | | | Unify parameters and callback after hooksLin Jen-Shin2016-12-144-24/+21
| * | | | | | | | Use a regular class for GitOperationServiceLin Jen-Shin2016-12-141-1/+8
| * | | | | | | | Fix source_project and also pass source_projectLin Jen-Shin2016-12-146-2/+7
| * | | | | | | | Also check blob path from source branchLin Jen-Shin2016-12-141-18/+39
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2016-12-1264-130/+888
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Not sure why, but apparently SHA works betterLin Jen-Shin2016-12-121-2/+2
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2016-12-10173-758/+2004
| |\ \ \ \ \ \ \ \ \
View Lorry Controller Status