summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into pipeline-hooks-...Kamil Trzcinski2016-08-164-12/+49
|\
| * Merge branch 'issue_18656' into 'master' Douwe Maan2016-08-161-0/+19
| |\
| | * Load issues and merge requests templates from repositoryFelipe Artur2016-08-161-0/+19
| * | Backport changes from gitlab-org/gitlab-ee!581 to CE.Timothy Andrew2016-08-161-10/+16
| |/
| * Merge branch 'akismet-submittable' into 'master' Robert Speicher2016-08-151-0/+2
| |\
| | * Allow `Issue` to be submitted as spamPatricio Cano2016-08-151-0/+2
| * | Merge branch 'frank-west-iii/gitlab-ce-fwiii-5857-web-editor-overwrites-commits'Douwe Maan2016-08-151-2/+12
| |\ \
| | * | Prevents accidental overwrites of commits from UIFrank West2016-08-151-2/+12
| | |/
* | | Merge branch 'fix-failing-tests' into pipeline-hooks-without-slackKamil Trzcinski2016-08-152-3/+22
|\ \ \ | |/ /
| * | Expose coverage report badge in pipeline settingsGrzegorz Bizon2016-08-151-1/+7
| * | Add method for coverage badge in badges controllerGrzegorz Bizon2016-08-151-2/+15
| * | Move badges to separate modules and add base classGrzegorz Bizon2016-08-152-2/+2
| |/
* | Merge branch 'improve-pipeline-processing' into pipeline-hooks-without-slackKamil Trzcinski2016-08-121-1/+1
|\ \ | |/
| * Merge branch '15000-rename-markdown-preview' into 'master' Robert Speicher2016-08-111-1/+1
| |\
| | * Rename `markdown_preview` routes to `preview_markdown`Christopher Bartz2016-08-111-1/+1
* | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-119-111/+307
|\ \ \ | |/ /
| * | Merge branch 'remove-grack-lfs' into 'master' Rémy Coutable2016-08-114-104/+299
| |\ \
| | * | Improve validation of X-Gitlab-Lfs-Tmp headerJacob Vosmaer2016-08-101-7/+3
| | * | Use && and || instead of ifJacob Vosmaer2016-08-101-12/+3
| | * | Rename lfs_enabled helper methodJacob Vosmaer2016-08-102-2/+2
| | * | Remove duplicate method reintroduced by mergeJacob Vosmaer2016-08-091-4/+0
| | * | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into remove-...Jacob Vosmaer2016-08-0911-68/+122
| | |\ \
| | * | | RubocopJacob Vosmaer2016-07-221-7/+6
| | * | | Better cache when modifying in-placeJacob Vosmaer2016-07-221-1/+1
| | * | | Add LFS controllersJacob Vosmaer2016-07-224-104/+313
| * | | | Pre-create all builds for Pipeline when a trigger is receivedKamil Trzcinski2016-08-114-6/+6
| | |_|/ | |/| |
| * | | Merge branch 'fix-branches-dropdown-initial-state' into 'master' Rémy Coutable2016-08-111-1/+2
| |\ \ \
| | * | | Fix branches page dropdown sort initial stateClement Ho2016-08-101-1/+2
| | | |/ | | |/|
* | | | Merge remote-tracking branch 'upstream/master' into pipeline-hooks-without-slackLin Jen-Shin2016-08-119-49/+61
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' into feature/svg-badge-templateGrzegorz Bizon2016-08-092-31/+28
| |\ \ \ | | |/ /
| | * | Merge branch 'zj-enable-deploy-keys-api' into 'master' Douwe Maan2016-08-081-14/+6
| | |\ \
| | | * | Namespace EnableDeployKeyService under ProjectsZ.J. van de Weg2016-08-081-1/+1
| | | * | Create service for enabling deploy keysZ.J. van de Weg2016-08-051-14/+6
| | * | | Merge branch 'git-http-push-check' into 'master' Robert Speicher2016-08-081-17/+22
| | |\ \ \
| | | * | | Stop 'git push' over HTTP earlyJacob Vosmaer2016-08-031-17/+22
| | | |/ /
| * | | | Merge branch 'master' into feature/svg-badge-templateGrzegorz Bizon2016-08-088-34/+81
| |\ \ \ \ | | |/ / /
| | * | | Add unfold links for Side-by-Side viewTim Masliuchenko2016-08-041-0/+2
| | * | | Make Compare#diffs diff_options a regular argumentDouwe Maan2016-08-031-2/+2
| | * | | switch from diff_file_collection to diffs20034-safe-diffsPaco Guzman2016-08-033-9/+7
| | * | | Introduce Compare model in the codebase.Paco Guzman2016-08-032-17/+8
| | * | | Move to Gitlab::Diff::FileCollectionPaco Guzman2016-08-033-10/+14
| | * | | Cache highlighted diff lines for merge requestsPaco Guzman2016-08-033-8/+12
| | |/ /
| | * | Merge branch 'rs-external-issue-tracker-redirect' into 'master' Douwe Maan2016-08-021-0/+13
| | |\ \
| | | * | Remove `url_for_new_issue` helperrs-external-issue-tracker-redirectRobert Speicher2016-08-011-3/+9
| | | * | Redirect to external issue tracker from `/issues`Robert Speicher2016-08-011-0/+7
| | * | | Speedup DiffNote#active? on discussions, preloading noteables and avoid touch...Paco Guzman2016-08-021-0/+2
| | |/ /
| * | | Use new badge template to render build status badgeGrzegorz Bizon2016-08-081-1/+2
| * | | Extract build status badge metadata to separate classGrzegorz Bizon2016-07-281-1/+1
* | | | Implement pipeline hooks, extracted from !5525Lin Jen-Shin2016-08-021-0/+1
| |/ / |/| |
* | | Merge branch '15064_issuable_default_sort_order' into 'master' Rémy Coutable2016-08-012-2/+4
|\ \ \
View Lorry Controller Status