summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Fix XSS issue by not using URI.joinDouwe Maan2017-02-061-2/+1
* Add 'View on [env]' link to blobs and individual files in diffsDouwe Maan2017-02-065-10/+86
* Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-064-7/+17
|\
| * Introduce maximum session time for terminal websocket connectionterminal-max-session-timeAdam Niedzielski2017-02-062-2/+16
| * Remove backlog lists from boardsDouglas Barbosa Alexandre2017-02-032-5/+1
* | Merge branch 'master' into jej-pages-picked-from-eeJames Edwards-Jones2017-02-038-255/+321
|\ \ | |/
| * Merge branch 'squash' into 'master' Sean McGivern2017-02-031-2/+2
| |\
| | * Backport changes from EE squashSean McGivern2017-02-031-2/+2
| * | Merge branch 'fwn-to-find-by-full-path' into 'master' Dmitriy Zaporozhets2017-02-031-5/+1
| |\ \ | | |/ | |/|
| | * replace `find_with_namespace` with `find_by_full_path`Adam Pahlevi2017-02-031-5/+1
| * | Merge branch 'fix-git-hooks-when-creating-file' into 'master' Douwe Maan2017-02-022-221/+275
| |\ \
| | * \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...fix-git-hooks-when-creating-fileLin Jen-Shin2017-02-0211-82/+113
| | |\ \
| | * \ \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-261-4/+4
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Use commit rather than branch, and rename to avoid confusionLin Jen-Shin2017-01-261-8/+8
| | * | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-2681-427/+788
| | |\ \ \
| | * | | | Rename from base to start because base could mean merge baseLin Jen-Shin2017-01-061-39/+39
| | * | | | Rename source to base to avoid confusion from MRLin Jen-Shin2017-01-061-39/+39
| | * | | | Prefer leading dots over trailing dotsLin Jen-Shin2017-01-061-2/+2
| | * | | | Remove tag with git hooksLin Jen-Shin2017-01-051-8/+11
| | * | | | Introduce Repository#with_repo_branch_commitLin Jen-Shin2017-01-051-9/+16
| | * | | | Indent the way rubocop likesLin Jen-Shin2017-01-051-1/+1
| | * | | | Merge branch 'master' into fix-git-hooks-when-creating-fileLin Jen-Shin2017-01-0462-439/+1168
| | |\ \ \ \
| | * | | | | Also check blob path from source branchLin Jen-Shin2016-12-141-18/+39
| | * | | | | 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-1012-141/+226
| | |\ \ \ \ \
| | * | | | | | Pass source_commit so that we save a few lookupsLin Jen-Shin2016-12-101-33/+18
| | * | | | | | Use rugged.references.delete to delete referenceLin Jen-Shin2016-12-091-3/+3
| | * | | | | | Introduce git_action and normalize previous_pathLin Jen-Shin2016-12-091-26/+46
| | * | | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2016-12-0819-97/+119
| | |\ \ \ \ \ \
| | * | | | | | | Introduce Repository#with_tmp_ref which we needLin Jen-Shin2016-12-082-1/+17
| | * | | | | | | Cleanup parameters, easier to understand andLin Jen-Shin2016-12-081-43/+48
| | * | | | | | | find the commit properly and replicate gitlab_gitLin Jen-Shin2016-12-081-1/+5
| | * | | | | | | Spaces around hash bracesLin Jen-Shin2016-12-081-9/+9
| | * | | | | | | We need to normalize the path for all actionsLin Jen-Shin2016-12-081-4/+6
| | * | | | | | | Use branch_name to find the branch rather than refLin Jen-Shin2016-12-081-2/+2
| | * | | | | | | Restore the check for update in commit_fileLin Jen-Shin2016-12-081-0/+8
| | * | | | | | | Use commit_file for commit_dirLin Jen-Shin2016-12-081-14/+24
| | * | | | | | | Use multi_action to commit which doesn't need toLin Jen-Shin2016-12-071-63/+36
| | * | | | | | | Not sure why rubocop prefers this but anywayLin Jen-Shin2016-12-071-2/+2
| | * | | | | | | Commit outside the hooks if possible:Lin Jen-Shin2016-12-071-2/+14
| | * | | | | | | Pass source_branch properly for cherry-pick/revertLin Jen-Shin2016-12-071-4/+8
| | * | | | | | | Introduce GitOperationService and wrap everyLin Jen-Shin2016-12-061-151/+23
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2016-12-0319-182/+126
| | |\ \ \ \ \ \ \
| | * | | | | | | | Add some explanation to Repository#update_branch_with_hooksLin Jen-Shin2016-11-251-2/+5
| | * | | | | | | | Fix local name from branch to branch_nameLin Jen-Shin2016-11-241-1/+1
| | * | | | | | | | Should also pass source_commit to raw_ensure_branchLin Jen-Shin2016-11-241-0/+1
| | * | | | | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2016-11-2414-166/+116
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Move all branch creation to raw_ensure_branch,Lin Jen-Shin2016-11-222-31/+65
| | * | | | | | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2016-11-2232-522/+843
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add a few comments to explain implementation detailLin Jen-Shin2016-11-151-0/+2
View Lorry Controller Status