summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Fix bug where destroying a namespace would not always destroy projectsStan Hu2016-08-112-4/+4
* Merge branch '15000-rename-markdown-preview' into 'master' Robert Speicher2016-08-112-2/+2
|\
| * Rename `markdown_preview` routes to `preview_markdown`Christopher Bartz2016-08-112-2/+2
* | 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-0928-148/+245
| |\ \
| * | | 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 branch 'clean-up-project-destroy' into 'master' Robert Speicher2016-08-101-1/+1
|\ \ \
| * | | Clean up project destructionclean-up-project-destroyStan Hu2016-08-101-1/+1
| |/ /
* | | Merge branch 'master' into feature/svg-badge-templateGrzegorz Bizon2016-08-094-32/+30
|\ \ \ | |/ /
| * | Merge branch 'duduribeiro/gitlab-ce-current_password_when_auto_set'Rémy Coutable2016-08-091-0/+1
| |\ \
| | * | Avoid to show the original password field when password is automatically setedCarlos Ribeiro2016-08-081-0/+1
| * | | 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
| | |/ / /
| * | | | Enable Style/SpaceAroundEqualsInParameterDefault coprubocop/SpaceAroundEqualsInParameterDefaultGabriel Mazetto2016-08-061-1/+1
| | |/ / | |/| |
* | | | Merge branch 'master' into feature/svg-badge-templateGrzegorz Bizon2016-08-0822-113/+185
|\ \ \ \ | |/ / /
| * | | Merge branch 'side-by-side-unfold' into 'master' Douwe Maan2016-08-051-0/+2
| |\ \ \
| | * | | Add unfold links for Side-by-Side viewTim Masliuchenko2016-08-041-0/+2
| * | | | Merge branch 'fix/ha-mode-import-issue' into 'master' Rémy Coutable2016-08-041-3/+4
| |\ \ \ \
| | * | | | using shared path for project import uploads and refactored gitlab remove exp...James Lopez2016-08-041-3/+4
| * | | | | Merge branch 'devise-deprecations' into 'master' Rémy Coutable2016-08-041-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Remove provider path, replace with dynamic path.devise-deprecationsConnor Shea2016-08-031-1/+1
| | * | | | Add an oauth provider path helper.Connor Shea2016-08-031-1/+1
| * | | | | 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-034-11/+15
| | |_|/ / | |/| | |
| * | | | 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
| |/ /
| * | Merge branch '15064_issuable_default_sort_order' into 'master' Rémy Coutable2016-08-016-66/+95
| |\ \
| | * | State specific default sort order for issuableszs2016-08-016-66/+95
| * | | Merge branch 'zj-env-external-url' into 'master' Rémy Coutable2016-08-011-6/+17
| |\ \ \
| | * | | Minor fixes in the Env API endpointszj-env-external-urlZ.J. van de Weg2016-08-011-1/+1
| | * | | Add an URL field to EnvironmentsZ.J. van de Weg2016-07-291-6/+17
| | |/ /
| * | | Clarify which project is deleted to avoid alarmclarify-deletion-messageStan Hu2016-07-291-1/+1
| * | | Merge branch 'rubocop/enable-access-modifiers-cops' into 'master' Robert Speicher2016-07-292-4/+0
| |\ \ \ | | |/ / | |/| |