summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '23205-information-about-environments-build-page' into 'master' Fatih Acet2016-11-185-3/+97
|\
| * Fix builds/show spec; use iid instead of id23205-information-about-environments-build-pageAnnabel Dunstone Gray2016-11-172-2/+2
| * Fix tests and add has_environment?Kamil Trzcinski2016-11-173-5/+9
| * Improve specs and add missing cases that were not supportedKamil Trzcinski2016-11-174-21/+48
| * Finish specs for environment infoAnnabel Dunstone Gray2016-11-091-9/+4
| * First pass at testsAnnabel Dunstone Gray2016-11-091-7/+8
| * Expose `last_deployment` on `Ci::Builds` [ci skip]Kamil Trzcinski2016-11-084-22/+47
| * Add switch statement & last_deployment methodAnnabel Dunstone Gray2016-11-083-3/+31
| * Start adding environment infoAnnabel Dunstone Gray2016-11-082-0/+14
* | Merge branch 'pass-correct-tag-target-to-post-receive' into 'master' Sean McGivern2016-11-181-3/+10
|\ \
| * | Pass correct tag target to post-receive hook when creating tag via UIpass-correct-tag-target-to-post-receiveAdam Niedzielski2016-11-181-3/+10
* | | Merge branch 'issue_13232' into 'master' Sean McGivern2016-11-181-35/+79
|\ \ \
| * | | Add JIRA remotelinks and prevent duplicated closing messagesFelipe Artur2016-11-181-35/+79
* | | | Merge branch 'fix-admin-ci-table' into 'master' Annabel Dunstone Gray2016-11-182-1/+7
|\ \ \ \
| * | | | Fix misaligned buttons on admin builds pageDidem Acet2016-11-172-1/+7
* | | | | Merge branch 'feature/cycle-analytics-events' into 'master' Douwe Maan2016-11-1816-67/+228
|\ \ \ \ \
| * | | | | 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-177-15/+24
| * | | | | small refactor - removing includes no longer neededJames Lopez2016-11-171-1/+0
| * | | | | added custom date helper and spec and fixed some unrelated spec failuresJames Lopez2016-11-174-4/+35
| * | | | | Refactor all query config stuff into separate classes and added specsJames Lopez2016-11-172-63/+63
| * | | | | 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-173-6/+7
| * | | | | serialize all the things!James Lopez2016-11-172-0/+17
| * | | | | get all stages to use serlalizers - apart from plan - WIPJames Lopez2016-11-173-8/+18
| * | | | | fix issue events and related spec - now using generic serializer for a hashJames Lopez2016-11-172-3/+8
| * | | | | use request to pass extra parametersJames Lopez2016-11-171-1/+1
| * | | | | WIP - refactor events to use a generic build entity for some of the hybrid ev...James Lopez2016-11-171-1/+1
| * | | | | WIP - adding a generic entity serializer that should accept a Hash coming fro...James Lopez2016-11-172-0/+35
| * | | | | WIP - refactored events to use build serializer, related spec passingJames Lopez2016-11-171-4/+10
| * | | | | WIP - refactoring URL builder and events presenter into serializersJames Lopez2016-11-173-2/+32
| * | | | | 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
| * | | | | Added test events specs and logic. Also fixed some SQL and refactored the pip...James Lopez2016-11-171-1/+1
| * | | | | add pipeline id to merge request metrics table. Also, updated the pipeline wo...James Lopez2016-11-173-3/+4
| * | | | | Started refactoring stuff to add events to cycle analyticsJames Lopez2016-11-171-48/+1
* | | | | | Merge branch 'optimize-mr-index' into 'master' Yorick Peterse2016-11-186-7/+9
|\ \ \ \ \ \
| * | | | | | More aggressively preload on merge request and issue index pagesDouwe Maan2016-11-186-7/+9
* | | | | | | Merge branch '23223-group-deletion-race-condition' into 'master' Rémy Coutable2016-11-181-6/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix a race condition that allowed soft-deleted groups to remain in the database.Timothy Andrew2016-11-181-6/+4
| | |_|_|_|/ / | |/| | | | |