summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rc-improve-members-destroy-service' into 'master' Robert Speicher2016-10-043-15/+9
|\
| * Fix a few things after the initial improvment to Members::DestroyServiceRémy Coutable2016-10-033-5/+7
| * Improve Members::DestroyServiceRémy Coutable2016-10-033-14/+6
* | Enable Lint/StringConversionInInterpolation cop and autocorrect offensesrs-string-conversion-in-interpolationRobert Speicher2016-10-031-1/+1
|/
* Merge branch 'fix/import-export-admin' into 'master' Robert Speicher2016-10-031-5/+0
|\
| * Enable import/export back for non-adminsfix/import-export-adminJames Lopez2016-10-031-5/+0
* | Add a /wip slash commandThomas Balthazar2016-10-031-1/+1
|/
* Merge branch '21744-fix-missing-values-in-linter' into 'master' Rémy Coutable2016-09-301-0/+1
|\
| * Expose jobs to viewKatarzyna Kobierska2016-09-301-0/+1
* | Merge branch 'close-merge-request-if-open-without-source-project' into 'master' Rémy Coutable2016-09-301-5/+8
|\ \
| * | Change callbackKatarzyna Kobierska2016-09-301-1/+1
| * | Callback close_merge_request_without_source_projectKatarzyna Kobierska2016-09-301-7/+8
| * | Improve grammarKatarzyna Kobierska2016-09-301-1/+1
| * | Close merge request if open without source projectKatarzyna Kobierska2016-09-301-2/+4
| |/
* | Small improvements thanks to Robert's feedbackRémy Coutable2016-09-302-3/+3
|/
* Merge branch 'mr_api_todo_close' into 'master' Rémy Coutable2016-09-301-2/+0
|\
| * Close todos when accepting a MR via the API.Tony Gambone2016-09-291-2/+0
* | Merge branch 'rc-new-access-requests-finder' into 'master' Douwe Maan2016-09-304-4/+4
|\ \ | |/ |/|
| * New AccessRequestsFinderRémy Coutable2016-09-284-4/+4
* | fix broken repo 500 errors in UI and added relevant specsJames Lopez2016-09-291-1/+6
* | Add Pipelines for CommitKamil Trzcinski2016-09-271-8/+9
|/
* Merge branch 'includes-projects-to-render-issue-notes' into 'master' Yorick Peterse2016-09-271-1/+1
|\
| * Fix IssuesController#show degradation including project on loaded notesincludes-projects-to-render-issue-notesPaco Guzman2016-09-271-1/+1
* | Be nice to Docker Clients talking to JWT/authKamil Trzcinski2016-09-271-5/+16
|/
* Merge branch 'dz-profile-organization' into 'master' Dmitriy Zaporozhets2016-09-271-1/+2
|\
| * Add organization field to user profileDmitriy Zaporozhets2016-09-271-1/+2
* | Merge branch 'rc-new-members-approve-request-access-service' into 'master' Douwe Maan2016-09-271-6/+1
|\ \ | |/ |/|
| * Ensure Members::ApproveAccessRequestService can fin a requester by IDRémy Coutable2016-09-221-1/+1
| * New Members::ApproveAccessRequestServiceRémy Coutable2016-09-221-6/+1
* | Fix snippets pagination22500-can-t-paginate-through-snippetsRémy Coutable2016-09-261-1/+1
* | Merge branch 'search-filters-label-fix' into 'master' Jacob Schatz2016-09-231-2/+2
|\ \
| * | Fixed search dropdown labels not displayingsearch-filters-label-fixPhil Hughes2016-09-121-2/+2
* | | Revert part of "Merge branch 'update_issues_mr_counter' into 'master'Rémy Coutable2016-09-225-20/+0
| |/ |/|
* | Merge branch 'and-you-get-awards' into 'master' Rémy Coutable2016-09-213-3/+13
|\ \
| * | Start Frontend work, fix routing problemZ.J. van de Weg2016-09-192-2/+5
| * | Snippets get award emoji! :thumbsup:Z.J. van de Weg2016-09-192-2/+9
* | | Merge branch 'post-merge-improve-of-ci-permissions' into 'master' Rémy Coutable2016-09-212-6/+6
|\ \ \
| * | | Improve JwtController implementationpost-merge-improve-of-ci-permissionsKamil Trzcinski2016-09-201-3/+3
| * | | Post-merge improve of CI permissionsKamil Trzcinski2016-09-201-3/+3
* | | | Merge branch '21170-cycle-analytics' into 'master' Stan Hu2016-09-211-0/+67
|\ \ \ \
| * | | | Implement fourth round of comments from @DouweM.Timothy Andrew2016-09-211-3/+8
| * | | | Move JSON generation (cycle analytics) into a controller method.Timothy Andrew2016-09-201-2/+34
| * | | | Merge remote-tracking branch 'origin/master' into 21170-cycle-analyticsTimothy Andrew2016-09-2016-108/+176
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Move cycle analytics JSON generation to a helper.Timothy Andrew2016-09-171-1/+3
| * | | | Add a JSON version of the `CycleAnalytics` page.Timothy Andrew2016-09-081-0/+5
| * | | | Merge remote-tracking branch 'origin/master' into 21170-cycle-analyticsTimothy Andrew2016-09-0723-80/+121
| |\ \ \ \
| * | | | | Authorize access to cycle analytics.Timothy Andrew2016-08-261-0/+2
| * | | | | Fetch cycle analytics data for a specific date range.Timothy Andrew2016-08-261-1/+17
| * | | | | Scope Cycle Analytics queries to a projectTimothy Andrew2016-08-261-1/+1
| * | | | | Add the "Plan" Cycle Analytics query.Timothy Andrew2016-08-261-28/+1
View Lorry Controller Status