summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-1028-148/+241
|\
| * 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 '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
| |\ \ | | |/ | |/|
| | * Fix some useless access modifiers in the codeGrzegorz Bizon2016-07-192-4/+0
| * | Use `Gitlab::Access` to protected branch access levels.Timothy Andrew2016-07-291-12/+19
| * | Humanize protected branches' access levels at one location.Timothy Andrew2016-07-291-1/+3
| * | Add "No One Can Push" to the protected branches UI.Timothy Andrew2016-07-291-1/+1
| * | Use the `{Push,Merge}AccessLevel` models in the UI.Timothy Andrew2016-07-291-7/+17
| * | Merge branch 'fix/use-fewer-queries-for-mr-notes' into 'master' Douwe Maan2016-07-281-1/+1
| |\ \
| | * | Reduce number of queries made for merge_requests/:id/diffsfix/use-fewer-queries-for-mr-notesAhmad Sherif2016-07-281-1/+1
| * | | Merge branch '20308-fix-title-that-is-show-in-the-dropdown-toggle-button-on-p...Rémy Coutable2016-07-281-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | Fix the title of the toggle dropdown buttonHerminio Torres2016-07-281-0/+1
| * | | Replace reject_blocked with reject_blocked! in callbacks.rename-undefined-methodsConnor Shea2016-07-273-3/+3
| * | | Merge branch 'akismet-ui-check' into 'master' Douwe Maan2016-07-271-2/+2
| |\ \ \
| | * | | Refactor spam validation to a concern that can be easily reused and improve l...akismet-ui-checkPatricio Cano2016-07-261-2/+2
| | * | | Refactor `SpamCheckService` to make it cleaner and clearer.Patricio Cano2016-07-261-7/+1
| | * | | Submit all issues on public projects to Akismet if enabled.Patricio Cano2016-07-261-13/+3
| | * | | Submit new issues created via the WebUI by non project members to Akismet for...Patricio Cano2016-07-261-1/+17
| * | | | Allow skipping users in autocompleteallow-skipping-users-in-autocompleteSean McGivern2016-07-271-0/+1
| * | | | Incorporate review commentsStan Hu2016-07-262-2/+2
| * | | | Optimize maximum user access level lookup in loading of notesStan Hu2016-07-262-0/+6
| | |/ / | |/| |
View Lorry Controller Status