summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Split Project#reset_cache_and_import_attrs upclean-up-project-for-merge-conflictsYorick Peterse2017-06-071-1/+5
* Re-order some methods in ProjectYorick Peterse2017-06-071-15/+16
* Merge branch '32587-fix-horse-racing-emoji-codepointat-npe' into 'master'Filipa Lacerda2017-06-073-1/+34
|\
| * Fix NPE with horse racing emoji check32587-fix-horse-racing-emoji-codepointat-npeEric Eastwood2017-06-023-1/+34
* | Merge branch 'expand-backlog-closed-lists-issue-boards' into 'master'Douwe Maan2017-06-0731-143/+402
|\ \
| * | change tests based on backend feedbackexpand-backlog-closed-lists-issue-boardsPhil Hughes2017-06-071-10/+4
| * | updated service specPhil Hughes2017-06-063-9/+33
| * | moved creating backlog list into list servicePhil Hughes2017-06-064-4/+6
| * | added tests for collapsingPhil Hughes2017-06-023-1/+141
| * | changed the icon for the collapsed backlog listPhil Hughes2017-06-014-3/+8
| * | fixed boards specsPhil Hughes2017-06-015-8/+9
| * | fixed issue_ordering_specPhil Hughes2017-06-011-18/+18
| * | fixed boards_specPhil Hughes2017-06-011-89/+85
| * | fixed new_issue_specPhil Hughes2017-06-011-3/+3
| * | spec updatesPhil Hughes2017-05-317-6/+22
| * | Expand/collapse close & backlog lists in issue boardsPhil Hughes2017-05-3112-10/+91
* | | Merge branch 'fix_rubocop_warning_about_has_key' into 'master'Grzegorz Bizon2017-06-071-1/+1
|\ \ \
| * | | Use key? instead of has_key? methodfix_rubocop_warning_about_has_keyPawel Chojnacki2017-06-071-1/+1
* | | | Merge branch 'backport-ee-fix-settings-scss' into 'master'Phil Hughes2017-06-071-1/+1
|\ \ \ \
| * | | | set overflow:visible to prevent dropdowns from getting cut offbackport-ee-fix-settings-scssMike Greiling2017-06-071-1/+1
| |/ / /
* | | | Merge branch '3191-deploy-keys-update' into 'master'Rémy Coutable2017-06-0727-154/+491
|\ \ \ \
| * | | | Implement ability to update deploy keysAlexander Randa2017-06-0227-154/+491
* | | | | Merge branch 'gitaly-0.11.0' into 'master'Sean McGivern2017-06-071-1/+1
|\ \ \ \ \
| * | | | | Use Gitaly 0.11.0Jacob Vosmaer2017-06-071-1/+1
* | | | | | Merge branch 'issue_27166_2' into 'master'Douwe Maan2017-06-074-6/+37
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Avoid repeated queries for pipeline builds on merge requestsissue_27166_2Felipe Artur2017-06-064-6/+37
* | | | | | Merge branch 'dm-diff-file-straight-diff' into 'master'Sean McGivern2017-06-078-23/+128
|\ \ \ \ \ \
| * | | | | | Fix Diff::Position#diff_file for positions on straight diffsdm-diff-file-straight-diffDouwe Maan2017-06-068-23/+128
* | | | | | | Merge branch 'feature/gb/persist-pipeline-stages' into 'master'Kamil Trzciński2017-06-0729-162/+365
|\ \ \ \ \ \ \
| * | | | | | | Fix retry build service specs related to the stagefeature/gb/persist-pipeline-stagesGrzegorz Bizon2017-06-071-3/+15
| * | | | | | | Merge branch 'feature/gb/migrate-pipeline-stages' into feature/gb/persist-pip...Grzegorz Bizon2017-06-06204-1836/+4140
| |\ \ \ \ \ \ \
| * | | | | | | | Add changelog for persistent stages improvementGrzegorz Bizon2017-06-061-0/+4
| * | | | | | | | Merge branch 'feature/gb/migrate-pipeline-stages' into feature/gb/persist-pip...Grzegorz Bizon2017-06-062-2/+1
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Clone stage_id when retrying a CI/CD jobGrzegorz Bizon2017-06-062-3/+2
| * | | | | | | | | Merge branch 'feature/gb/migrate-pipeline-stages' into feature/gb/persist-pip...Grzegorz Bizon2017-06-069-51/+60
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Improve specs for pipeline and pipeline seedsGrzegorz Bizon2017-06-052-3/+3
| * | | | | | | | | | Fix typo in import/export safe model attributesGrzegorz Bizon2017-06-051-1/+1
| * | | | | | | | | | Merge branch 'feature/gb/migrate-pipeline-stages' into feature/gb/persist-pip...Grzegorz Bizon2017-06-055-6/+26
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'feature/gb/migrate-pipeline-stages' into feature/gb/persist-pip...Grzegorz Bizon2017-06-054-5/+15
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add assertions about new pipeline stage in specsGrzegorz Bizon2017-06-051-0/+4
| * | | | | | | | | | | | Merge branch 'master' into feature/gb/persist-pipeline-stagesGrzegorz Bizon2017-06-051053-6751/+20984
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Export pipeline stages in import/export featureGrzegorz Bizon2017-06-054-0/+16
| * | | | | | | | | | | | | Revert invalid changes in new pipeline service specsGrzegorz Bizon2017-06-051-2/+2
| * | | | | | | | | | | | | Remove legacy method from pipeline classGrzegorz Bizon2017-06-051-11/+0
| * | | | | | | | | | | | | Fix invalid conditional in pipeline create serviceGrzegorz Bizon2017-06-023-5/+5
| * | | | | | | | | | | | | Refine implementation of pipeline stage seedsGrzegorz Bizon2017-06-0212-205/+172
| * | | | | | | | | | | | | Merge branch 'feature/gb/migrate-pipeline-stages' into feature/gb/persist-pip...Grzegorz Bizon2017-06-012-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix exposing legacy stages in pipeline entityGrzegorz Bizon2017-06-011-3/+3
| * | | | | | | | | | | | | | Rename `Ci::Stage` class to `Ci::LegacyStage`Grzegorz Bizon2017-06-015-7/+9
| * | | | | | | | | | | | | | Rename pipeline methods related to legacy stagesGrzegorz Bizon2017-06-018-23/+23
View Lorry Controller Status