summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Expose note urlchanges_tab_vue_refactoringFelipe Artur2018-03-271-0/+5
|
* empty state for changes tabSimon Knox2018-03-272-12/+66
|
* fix Hide Whitespace buttonSimon Knox2018-03-272-3/+20
|
* Merge branch 'changes_tab_vue_refactoring' of ↵Simon Knox2018-03-2784-1365/+2048
|\ | | | | | | gitlab.com:gitlab-org/gitlab-ce into changes_tab_vue_refactoring
| * Merge branch '_mr-refector-review-target' of gitlab.com:gitlab-org/gitlab-ce ↵Fatih Acet2018-03-260-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into changes_tab_vue_refactoring # Conflicts: # app/assets/javascripts/diffs/components/changed_files.vue # app/assets/javascripts/diffs/components/diff_file.vue # app/assets/javascripts/diffs/components/diff_line_gutter_content.vue # app/assets/javascripts/diffs/components/inline_diff_view.vue # app/assets/javascripts/diffs/components/parallel_diff_view.vue # app/assets/javascripts/diffs/constants.js # app/assets/javascripts/diffs/mixins/diff_content.js # app/assets/javascripts/diffs/store/actions.js # app/assets/javascripts/diffs/store/mutation_types.js # app/assets/javascripts/diffs/store/mutations.js # app/assets/javascripts/diffs/store/utils.js # app/assets/javascripts/mr_notes/index.js # app/assets/javascripts/mr_notes/stores/getters.js # app/assets/javascripts/notes.js # app/assets/javascripts/notes/components/diff_file_header.vue
| | * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵_mr-refector-review-targetFatih Acet2018-03-26738-4121/+18510
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | _mr-refector-review-target # Conflicts: # app/assets/javascripts/notes.js
| | * \ Merge branch '_mr-refactor-part-14' into '_mr-refector-review-target'Tim Zallmann2018-03-262-0/+288
| | |\ \ | | | | | | | | | | | | | | | | | | | | MR Diffs Refactor Part 14: Inline and Parallel diff view components. See merge request gitlab-org/gitlab-ce!17858
| | | * | MR Diffs Refactor Part 14: Inline and Parallel diff view components._mr-refactor-part-14Fatih Acet2018-03-192-0/+288
| | | | |
| | * | | Merge branch '_mr-refactor-part-11' into '_mr-refector-review-target'Tim Zallmann2018-03-264-0/+199
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | MR Diffs Refactor Part 11: Diffs app index and app components. See merge request gitlab-org/gitlab-ce!17855
| | | * | | MR Diffs Refactor Part 11: Diffs app index and app components._mr-refactor-part-11Fatih Acet2018-03-194-0/+199
| | | |/ /
| | * | | Merge branch '_mr-refactor-part-13' into '_mr-refector-review-target'Tim Zallmann2018-03-262-0/+120
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | MR Diffs Refactor Part 13: DiffContent and DiffFile components. See merge request gitlab-org/gitlab-ce!17857
| | | * | | MR Diffs Refactor Part 13: DiffContent and DiffFile components._mr-refactor-part-13Fatih Acet2018-03-192-0/+120
| | | |/ /
| | * | | Merge branch '_mr-refactor-part-10' into '_mr-refector-review-target'Tim Zallmann2018-03-266-0/+277
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | MR Diffs Refactor Part 10: Diffs app store. See merge request gitlab-org/gitlab-ce!17854
| | | * | | MR Diffs Refactor Part 10: Diffs app store._mr-refactor-part-10Fatih Acet2018-03-196-0/+277
| | | |/ /
| | * | | Merge branch '_mr-refactor-part-8' into '_mr-refector-review-target'Tim Zallmann2018-03-263-11/+72
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | MR Diffs Refactor Part 08: Extra props for reusability. See merge request gitlab-org/gitlab-ce!17852
| | | * | | MR Diffs Refactor Part 08: Extra props for reusability._mr-refactor-part-8Fatih Acet2018-03-193-11/+72
| | | |/ /
| | * | | Merge branch '_mr-refactor-part-12' into '_mr-refector-review-target'Tim Zallmann2018-03-263-0/+366
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | MR Diffs Refactor Part 12: Diffs static components. See merge request gitlab-org/gitlab-ce!17856
| | | * | | MR Diffs Refactor Part 12: Diffs static components.Fatih Acet2018-03-263-0/+366
| | |/ / /
| | * | | Merge branch '_mr-refactor-part-15' into '_mr-refector-review-target'Tim Zallmann2018-03-263-0/+197
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | MR Diffs Refactor Part 15: Diff refactor components. See merge request gitlab-org/gitlab-ce!17859
| | | * | | MR Diffs Refactor Part 15: Diff refactor components._mr-refactor-part-15Fatih Acet2018-03-193-0/+197
| | | |/ /
| | * | | Merge branch '_mr-refactor-part-7' into '_mr-refector-review-target'Tim Zallmann2018-03-219-10/+85
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | MR Diffs Refactor Part 07: Modulize notes. See merge request gitlab-org/gitlab-ce!17851
| | | * | | MR Diffs Refactor Part 07: Modulize notes._mr-refactor-part-7Fatih Acet2018-03-199-10/+85
| | | |/ /
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Fatih Acet2018-03-2684-1365/+2048
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | changes_tab_vue_refactoring
| | * | | Merge branch 'dz-improve-app-settings' into 'master'Filipa Lacerda2018-03-2611-279/+421
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Redesign application settings to match project settings (part 1) See merge request gitlab-org/gitlab-ce!17937
| | | * | | Put forms from expandable sections into fieldset to ensure proper animationDmitriy Zaporozhets2018-03-266-222/+237
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | | * | | Remove gray background from app setting expandable sectionsDmitriy Zaporozhets2018-03-267-24/+18
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | | * | | Improve application settings page according to feedbackDmitriy Zaporozhets2018-03-267-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Replace btn-save with btn-success * Add id to each section so it can be directly linked Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | | * | | Move UI of several application settings to expandable blockdz-improve-app-settingsDmitriy Zaporozhets2018-03-2611-279/+412
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make design consistent with project settings Next admin area application settings are afected by this commit: * Visibility and access control * Account and limit settings * Sign in * Sign up * Help page * Pages Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Merge branch 'backstage/gb/populating-pipeline-refactoring' into 'master'Kamil Trzciński2018-03-2621-892/+1151
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve how we populate pipeline with stages and builds Closes #43941 See merge request gitlab-org/gitlab-ce!17841
| | | * | | | Make stage seed instance variables less ambiguousbackstage/gb/populating-pipeline-refactoringGrzegorz Bizon2018-03-261-4/+4
| | | | | | |
| | | * | | | Remove outdates TODOs from pipeline classGrzegorz Bizon2018-03-231-4/+0
| | | | | | |
| | | * | | | Add specs for extracted pipeline-related methodsGrzegorz Bizon2018-03-221-0/+18
| | | | | | |
| | | * | | | Bring seeds size method back to CI/CD pipeline classGrzegorz Bizon2018-03-222-0/+21
| | | | | | |
| | | * | | | Improve YAML processor specs and remove unused codeGrzegorz Bizon2018-03-221-29/+25
| | | | | | |
| | | * | | | Fix static analysis and tests related to YAML processingGrzegorz Bizon2018-03-225-67/+103
| | | | | | |
| | | * | | | Add specs for pipeline chain that builds stages and jobsGrzegorz Bizon2018-03-224-11/+52
| | | | | | |
| | | * | | | Do not select included stage seeds in populate chainGrzegorz Bizon2018-03-221-5/+2
| | | | | | |
| | | * | | | Decouple YAML processor from pipeline objectsGrzegorz Bizon2018-03-223-57/+43
| | | | | | |
| | | * | | | Move policy related specs our of YAML processor testsGrzegorz Bizon2018-03-227-580/+534
| | | | | | |
| | | * | | | Fix rubocop offense in pipeline build seed classGrzegorz Bizon2018-03-221-13/+11
| | | | | | |
| | | * | | | Add a guard clause to avoid creating empty stagesGrzegorz Bizon2018-03-211-0/+3
| | | | | | |
| | | * | | | Evaluate only/except policies outside of YAML processorGrzegorz Bizon2018-03-214-12/+62
| | | | | | |
| | | * | | | Make it easier to test pipeline stage seedsGrzegorz Bizon2018-03-218-36/+39
| | | | | | |
| | | * | | | Reduce stage seeds coupling between pipeline and YAMLGrzegorz Bizon2018-03-216-58/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a first step to decouple pipeline from YAML processing. It reduces the coupling by removing some methods that introduce coupling and by moving logic into separate chain element that is being used to populate pipelines with stages and builds.
| | | * | | | Add specs for chain element that populates a pipelineGrzegorz Bizon2018-03-213-23/+126
| | | | | | |
| | | * | | | Populate pipeline with objects before creating itGrzegorz Bizon2018-03-216-17/+47
| | | | | | |
| | | * | | | Remove legacy service for creating pipeline stagesGrzegorz Bizon2018-03-215-24/+9
| | | | | | |
| | | * | | | Decouple pipeline stage seeds from building environmentsGrzegorz Bizon2018-03-214-18/+21
| | | | | | |
| | | * | | | Support building all pipeline resource before savingGrzegorz Bizon2018-03-214-30/+36
| | | | | | |
| | | * | | | Introduce pipeline build seedsGrzegorz Bizon2018-03-215-29/+63
| | | | | | |
View Lorry Controller Status