summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'backport-ee-1067-deal-with-repo-size-limit-as-byte' into 'master' Yorick Peterse2017-01-251-1/+5
|\
| * EE backport for new application settings serviceOswaldo Ferreira2017-01-231-1/+5
* | Merge branch '24833-Allow-to-search-by-commit-hash-within-project' into 'mast...Sean McGivern2017-01-241-0/+14
|\ \
| * | Search feature: redirects to commit page if query is commit sha and only comm...YarNayar2017-01-241-0/+14
* | | Merge branch 'disable-automatic-login-on-email-confirmation' into 'master' Marin Jankovski2017-01-241-6/+2
|\ \ \ | |_|/ |/| |
| * | Disable automatic login feature when clicking on email confirmation linksdisable-automatic-login-on-email-confirmationBrian Neel2016-12-311-6/+2
* | | pass username and id associations needed in the frontend26955-handle-legacy-issue-filter-paramsMike Greiling2017-01-201-18/+12
* | | automatically redirect urls containing author_id or assignee_idMike Greiling2017-01-201-0/+18
* | | Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master' Rémy Coutable2017-01-203-14/+22
|\ \ \ | |_|/ |/| |
| * | Fixed tests and a rubocop linter26138-combine-webhooks-and-services-settings-pagesJose Ivan Vargas2017-01-181-4/+2
| * | Removed the index action from both the projects hook and services controllersJose Ivan Vargas2017-01-182-9/+2
| * | Corrected code style and titlesJose Ivan Vargas2017-01-181-1/+1
| * | Moved the webhooks and services gear options to a single one called integrationsJose Ivan Vargas2017-01-183-5/+22
* | | Merge branch '23563-document-presenters' into 'master' Dmitriy Zaporozhets2017-01-191-1/+1
|\ \ \
| * | | More improvements to presenters23563-document-presentersRémy Coutable2017-01-181-1/+1
| * | | Add Presentable concernRémy Coutable2017-01-181-1/+1
* | | | Merge branch '26117-sort-pipeline-for-commit' into 'master' Kamil Trzciński2017-01-191-5/+0
|\ \ \ \
| * | | | Add sorting pipeline for a commitTakuya Noguchi2017-01-191-5/+0
* | | | | Merge branch 'speed-up-dashboard-milestone-index' into 'master' Sean McGivern2017-01-191-2/+2
|\ \ \ \ \
| * | | | | Speed up dashboard milestone index by scoping IssuesFinder to user authorized...speed-up-dashboard-milestone-indexAdam Niedzielski2017-01-161-2/+2
* | | | | | Merge branch 'current-user-filter-top' into 'master' Sean McGivern2017-01-191-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Shows current user on top of filtered dropdown listcurrent-user-filter-topPhil Hughes2017-01-171-1/+1
* | | | | | Merge branch 'fix/refactor-cycle-analytics-stages' into 'master' Douwe Maan2017-01-183-64/+26
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | refactor fetcher and fixed specsJames Lopez2017-01-171-1/+1
| * | | | | refactor cycle analytics - updated based on MR feedbackJames Lopez2017-01-172-10/+10
| * | | | | Fix other spec failuresJames Lopez2017-01-173-17/+17
| * | | | | more refactoring and fixing old specsJames Lopez2017-01-173-7/+9
| * | | | | added new summary serializers and refactor all of the summary stuff into sepa...James Lopez2017-01-171-45/+5
| |/ / / /
* | | | | Merge branch 'i-#25814-500-error' into 'master' Sean McGivern2017-01-181-1/+10
|\ \ \ \ \
| * | | | | refactor rubocop suggestionMartin Cabrera2017-01-161-1/+1
| * | | | | Merge branch 'master' into i-#25814-500-errorMartin Cabrera2017-01-161-7/+4
| |\ \ \ \ \ | | |/ / / /
| * | | | | Refactored ‘from’ and ‘to’ variable preservationMartin Cabrera2017-01-161-10/+6
| * | | | | from or to get variables gets preserved if the other one is missingMartin Cabrera2017-01-151-2/+9
| * | | | | Merge branch 'master' into i-#25814-500-errorMartin Cabrera2017-01-153-25/+66
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Changed alert message character: from & to and Martin Cabrera2017-01-151-1/+2
| * | | | | Merge branch 'master' into i-#25814-500-errorMartin Cabrera2017-01-123-56/+92
| |\ \ \ \ \
| * | | | | | Fix Compare page throws 500 error when any branch/reference is not selectedMartin Cabrera2017-01-101-1/+6
* | | | | | | Merge branch '24915_merge_slash_command' into 'master' Sean McGivern2017-01-172-1/+12
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Address MR commentsJarka Kadlecova2017-01-131-1/+1
| * | | | | | refresh merge widget after using /merge commandJarka Kadlecova2017-01-111-0/+10
| * | | | | | support `/merge` slash comand for MRsJarka Kadlecova2017-01-111-1/+2
| |/ / / / /
* | | | | | Add a spec and actually display the flash noticeRémy Coutable2017-01-161-7/+4
* | | | | | Fix to display notice when project settings updated.sandish chen2017-01-151-2/+2
| |_|/ / / |/| | | |
* | | | | Merge branch 'refactor-controller-params' into 'master' Robert Speicher2017-01-122-21/+66
|\ \ \ \ \
| * | | | | Refactor authorized params in GroupsControllerRémy Coutable2017-01-121-2/+6
| * | | | | Refactor allowed params in ServiceParamsRémy Coutable2017-01-121-19/+60
| | |/ / / | |/| | |
* | | | | Merge branch '24185-legacy-ci-status-reactive-cache' into 'security'Robert Speicher2017-01-121-4/+0
|/ / / /
* | | | Add support for PlantUML diagrams in Asciidoc.Horacio Sanson2017-01-121-0/+2
* | | | Refactor authorized params in Admin::UsersControllerrefactor-admin-controllers-paramsRémy Coutable2017-01-112-27/+32
* | | | Refactor authorized params in Admin::GroupsControllerRémy Coutable2017-01-111-2/+6
View Lorry Controller Status