summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Backport Note#commands_changes from EEbackport-commands-paramsDouwe Maan2016-11-241-0/+1
* Merge branch '24804-wrong-render-index-should-be-render-show-in-projects-pipe...Kamil Trzciński2016-11-221-1/+1
|\
| * Fix wrong template rendered when CI/CD settings aren't update successfullyRémy Coutable2016-11-221-1/+1
* | Merge branch 'hot-fix-define-pipeline-vars' into 'master' Rémy Coutable2016-11-221-5/+2
|\ \
| * | Do not use MergeRequest#commits in define_pipelines_varshot-fix-define-pipeline-varsAdam Niedzielski2016-11-221-5/+2
| |/
* | Merge branch '24576_cant_stop_impersonating' into 'master' Sean McGivern2016-11-221-1/+1
|\ \ | |/ |/|
| * Allow admins to stop impersonating users without e-mail addressesOren Kanner2016-11-171-1/+1
* | Merge branch '23449-cycle-analytics-2-frontend' into 'master' Jacob Schatz2016-11-221-9/+10
|\ \
| * | Use stage description form endpoint responseAlfredo Sumaran2016-11-211-5/+5
| * | Provide stage legend on server responseAlfredo Sumaran2016-11-211-9/+10
* | | Merge branch 'hide-empty-merge-request-diffs' into 'master' Sean McGivern2016-11-211-4/+4
|\ \ \ | |/ / |/| |
| * | Hide box with CI status when there are no changes in merge requestAdam Niedzielski2016-11-211-1/+1
| * | Return valid response in Projects::MergeRequestsController#ci_status when dif...Adam Niedzielski2016-11-211-1/+1
| * | Hide empty merge request diffs when comparing versionsAdam Niedzielski2016-11-211-2/+2
* | | Updated code based on feedbackfix/cycle-analytics-no-dataJames Lopez2016-11-211-5/+1
* | | rename methodJames Lopez2016-11-211-2/+2
* | | Adds a flag to reflect whether or not there is data in cycle analyticsJames Lopez2016-11-211-5/+19
* | | Merge branch 'fix/cycle-analytics-permissions' into 'master' Sean McGivern2016-11-211-1/+2
|\ \ \
| * | | refactored a couple of things based on feedbackfix/cycle-analytics-permissionsJames Lopez2016-11-211-2/+2
| * | | Added permissions per stage to cycle analytics endpointJames Lopez2016-11-211-2/+3
| |/ /
* | | Merge branch 'ee-870-backport' into 'master' Sean McGivern2016-11-214-15/+16
|\ \ \ | |/ / |/| |
| * | Backport some changes done from Time Tracking feature in EE.ee-870-backportRuben Davila2016-11-184-15/+16
* | | Merge remote-tracking branch 'origin/master' into 22539-display-foldersKamil Trzcinski2016-11-1817-24/+172
|\ \ \
| * \ \ Merge branch 'zj-slash-commands-mattermost' into 'master' Kamil Trzciński2016-11-181-0/+2
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/master' into zj-slash-commands-mattermostZ.J. van de Weg2016-11-179-13/+32
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Make chat authorization to work [ci skip]Kamil Trzcinski2016-11-171-0/+2
| | * | | Remove duplication of implementationsZ.J. van de Weg2016-11-171-10/+0
| | * | | issue and mergerequest slash command for mattermostZ.J. van de Weg2016-11-171-0/+10
| | * | | Fix `chat_names` before_actionKamil Trzcinski2016-11-171-1/+1
| | * | | Create relation between chat user and GitLab user and allow to authorize them...Kamil Trzcinski2016-11-171-0/+64
| * | | | Improved Ruby code in autocomplete user searchPhil Hughes2016-11-181-1/+1
| * | | | Merge branch 'feature/cycle-analytics-events' into 'master' Douwe Maan2016-11-183-9/+74
| |\ \ \ \
| | * | | | refactored updater and updated specsJames Lopez2016-11-181-9/+1
| | * | | | added new build updater, specs and refactored allowed_idsJames Lopez2016-11-181-2/+8
| | * | | | more refactoring and added some auth checksJames Lopez2016-11-171-1/+1
| | * | | | fix integration specJames Lopez2016-11-171-1/+1
| | * | | | refactor events facade so it uses separate classes and refactor query stuffJames Lopez2016-11-171-1/+1
| | * | | | Refactor all query config stuff into separate classes and added specsJames Lopez2016-11-171-62/+62
| | * | | | fix issue with commits and also updated routesJames Lopez2016-11-171-1/+5
| | * | | | fix authorization of builds and added relevant specJames Lopez2016-11-171-1/+5
| | * | | | Renamed pipeline column and fixed permissions for builds in events controllerJames Lopez2016-11-171-3/+4
| | * | | | WIP - refactoring URL builder and events presenter into serializersJames Lopez2016-11-171-2/+2
| | * | | | rename events hashJames Lopez2016-11-171-1/+1
| | * | | | refactored duplicated code in controller, updated JSON array naming and fixed...James Lopez2016-11-173-35/+22
| | * | | | fix module issue in cycle analytics controllerJames Lopez2016-11-171-1/+1
| | * | | | Added branch option to test eventsJames Lopez2016-11-171-2/+8
| | * | | | added missing fields to plan events and updated specJames Lopez2016-11-171-9/+12
| | * | | | add email to user related queries so it can be used for displaying avatar in ...James Lopez2016-11-171-8/+8
| | * | | | added the rest of the stages to the controller and relevant specsJames Lopez2016-11-171-4/+32
| | * | | | added cycle analytics events controller and started integration specJames Lopez2016-11-171-0/+34
| | |/ / /
View Lorry Controller Status