summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* 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 'fix/refactor-cycle-analytics-stages' into 'master' Douwe Maan2017-01-182-64/+22
|\ \ \ | |_|/ |/| |
| * | 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-172-15/+15
| * | more refactoring and fixing old specsJames Lopez2017-01-172-7/+5
| * | 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
| * | | 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-151-4/+0
| |\ \ \ | | |/ /
| * | | Changed alert message character: from & to and Martin Cabrera2017-01-151-1/+2
| * | | 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
| |/ /
* | | Merge branch '24185-legacy-ci-status-reactive-cache' into 'security'Robert Speicher2017-01-121-4/+0
|/ /
* | Merge branch 'master' into auto-pipelines-vueRegis2017-01-093-52/+64
|\ \ | |/
| * Merge branch '25985-combine-members-and-groups-settings-pages' into 'master' Alfredo Sumaran2017-01-063-52/+64
| |\
| | * Updated the "users" to "members" matches in the viewJose Ivan Vargas2017-01-031-3/+3
| | * Removed the "Groups" option from the settings gearJose Ivan Vargas2017-01-031-2/+2
| | * Added groups to members section, added a members finderJose Ivan Vargas2017-01-032-10/+10
| | * Fixed more rspec tests as well as spinach featuresJose Ivan Vargas2017-01-031-1/+2
| | * Fixed rspec tests for the project members also fixed the indexJose Ivan Vargas2017-01-031-42/+1
| | * Moved the members (project_members)option to a single controller called membersJose Ivan Vargas2017-01-032-4/+56
* | | Include resources to speed up pipelines serializerGrzegorz Bizon2017-01-051-1/+0
* | | Merge branch 'master' into auto-pipelines-vueRegis2017-01-042-2/+3
|\ \ \ | |/ /
| * | Merge branch '25836-changing-from-version-in-diff-comparison-does-not-preserv...Fatih Acet2017-01-031-1/+2
| |\ \ | | |/ | |/|
| | * Preserve selected versions when comparing MR changes25836-changing-from-version-in-diff-comparison-does-not-preserve-to-versionSam Rose2016-12-311-1/+2
| * | Rename logo, apply for Slack tooZ.J. van de Weg2017-01-031-1/+1
| * | Add logo in public filesZ.J. van de Weg2017-01-031-1/+1
| * | Use stable icon for Mattermost integrationKamil Trzcinski2017-01-031-1/+1
| |/
* | fix pipelines/index.html.haml merge conflictRegis2017-01-025-3/+12
|\ \ | |/
| * Merge branch '25925-fix-tag-sorting-and-filtering-options' into 'master' Annabel Dunstone Gray2016-12-291-1/+1
| |\
| | * Set default sort for tags to Last updated25925-fix-tag-sorting-and-filtering-optionsSam Rose2016-12-281-1/+1
| * | Merge branch '19988-prevent-empty-pagination-when-list-not-empty' into 'master' Douwe Maan2016-12-283-0/+9
| |\ \ | | |/ | |/|
| | * applies url_for so that we dont lose filters when redirecting19988-prevent-empty-pagination-when-list-not-emptyTiago Botelho2016-12-232-2/+2
View Lorry Controller Status