summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/rename-mwbs-to-merge-when-pipeline-succeeds' into 'master' Kamil Trzciński2016-12-051-4/+10
|\
| * Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeedsGrzegorz Bizon2016-11-3010-58/+49
| |\
| * \ Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeedsGrzegorz Bizon2016-11-256-36/+47
| |\ \
| * | | Rename MWBS service to Merge When Pipeline SucceedsGrzegorz Bizon2016-11-211-4/+9
* | | | Merge branch '24814-pipeline-tabs' into 'master' Fatih Acet2016-12-011-1/+9
|\ \ \ \
| * | | | Adds tests for tabs in the rspec for pipelinesFilipa Lacerda2016-11-301-2/+6
| * | | | Pipelines tabsFilipa Lacerda2016-11-301-0/+4
| | |_|/ | |/| |
* | | | Merge branch '18546-update-wiki-page-design' into 'master' Fatih Acet2016-12-011-0/+2
|\ \ \ \
| * | | | use wiki pages index for sidebar overflow and limit sidebar list to 15 pagesMike Greiling2016-11-301-0/+2
| |/ / /
* | | | Replace references to MergeRequestDiff#commits with st_commitsuse-st-commits-where-possibleAdam Niedzielski2016-12-011-2/+2
|/ / /
* | | Rename `MergeRequest#pipeline` to `head_pipeline`fix/rename-merge-request-head-pipelineGrzegorz Bizon2016-11-291-7/+8
* | | Merge branch 'jej-fix-missing-access-check-on-issues' into 'security'Douwe Maan2016-11-283-9/+3
* | | Merge branch 'jej-22869' into 'security'Douwe Maan2016-11-281-12/+8
* | | Prevent error when submitting a merge request and pipeline is not defined24860-actionview-template-error-undefined-method-size-for-nil-nilclassAdam Niedzielski2016-11-281-1/+1
* | | Merge branch '22253-move-lfshelper-methods-somewhere-else-than-app-helpers' i...Robert Speicher2016-11-284-28/+28
|\ \ \
| * | | Move LfsHelper to a new LfsRequest concern22253-move-lfshelper-methods-somewhere-else-than-app-helpersRémy Coutable2016-11-234-28/+28
* | | | Merge branch 'events-cache-invalidation' into 'master' Douwe Maan2016-11-281-1/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove event caching codeYorick Peterse2016-11-231-1/+0
* | | | Merge branch 'backport-commands-params' into 'master' Douwe Maan2016-11-241-0/+1
|\ \ \ \
| * | | | Backport Note#commands_changes from EEbackport-commands-paramsDouwe Maan2016-11-241-0/+1
| |/ / /
* | | | Add a starting date to milestonesmilestone_start_dateValery Sizov2016-11-231-1/+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
* | | | Do not use MergeRequest#commits in define_pipelines_varshot-fix-define-pipeline-varsAdam Niedzielski2016-11-221-5/+2
|/ / /
* | | 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-213-14/+15
|\ \ | |/ |/|
| * Backport some changes done from Time Tracking feature in EE.ee-870-backportRuben Davila2016-11-183-14/+15
* | Merge remote-tracking branch 'origin/master' into 22539-display-foldersKamil Trzcinski2016-11-187-16/+78
|\ \
| * \ 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-173-3/+7
| | |\ \
| | * | | Make chat authorization to work [ci skip]Kamil Trzcinski2016-11-171-0/+2
| * | | | Merge branch 'feature/cycle-analytics-events' into 'master' Douwe Maan2016-11-182-9/+67
| |\ \ \ \
| | * | | | 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