summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Move project ci lint under '-' scope43603-ci-lint-supportMayra Cabrera2018-03-261-4/+4
|
* Update documentation regarding Ci LinterMayra Cabrera2018-03-262-4/+5
|
* Changes ci/lints controller to use authorize before actionMayra Cabrera2018-03-262-5/+2
| | | | | Also includes a comment on Ci::Config regarding that's going to be override by EE
* Remove unused css classMayra Cabrera2018-03-261-1/+1
|
* Removes lint scss fileMayra Cabrera2018-03-261-3/+0
|
* Change ci/lint page to use a template structureMayra Cabrera2018-03-264-21/+9
| | | | | - Removes duplicated CSS - Includes translations for strings
* Build ci/lint pageMayra Cabrera2018-03-266-43/+56
| | | | | - Includes new image from gitlab-svgs - Updates dependency for svgs
* Make ci/lint page context aware:Mayra Cabrera2018-03-2617-50/+215
| | | | | | | | | - Create ci/lints controller inside project/ - Move js pages to be inside projects/ - Copy view ci/lint view to be inside project folder - Remove ci/lint view and js files Closes #43603
* 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
| | |
| * | Start building abstraction over pipeline seedsGrzegorz Bizon2018-03-216-69/+90
| | |
| * | Instantiate pipeline stages and builds before savingGrzegorz Bizon2018-03-193-37/+41
| | |
* | | Merge branch 'update-omniauth-twitter' into 'master'Douwe Maan2018-03-262-5/+5
|\ \ \ | | | | | | | | | | | | | | | | Update omniauth-twitter 1.2.0 -> 1.4 See merge request gitlab-org/gitlab-ce!17876
| * | | Update omniauth-twitter 1.2.0 -> 1.4Pirate Praveen2018-03-202-5/+5
| | | |
* | | | Merge branch '43552-user-owned-projects-query-performance-improvement' into ↵Douwe Maan2018-03-262-3/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Slow SQL running in production queryid 3257994922" Closes #43552 See merge request gitlab-org/gitlab-ce!17934
| * | | | Improves User#owned_projects query performanceTiago Botelho2018-03-262-3/+15
| | | | |
* | | | | Merge branch ↵Grzegorz Bizon2018-03-2615-10/+154
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'YarNayar/gitlab-ce-23460-send-email-when-pushing-more-commits-to-the-merge-request' into 'master' Send notification emails when push to a merge request Closes #23460 See merge request gitlab-org/gitlab-ce!17865
| * | | | | Send notification emails when push to a merge requestYarNayar/gitlab-ce-23460-send-email-when-pushing-more-commits-to-the-merge-requestYarNayar2018-03-2615-10/+154
| | | | | | | | | | | | | | | | | | | | | | | | Closes #23460
* | | | | | Merge branch 'blackst0ne-rails5-update-state_machines-activerecord-gem' into ↵Douwe Maan2018-03-264-77/+71
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Bump `state_machines-activerecord` to `0.5.1` See merge request gitlab-org/gitlab-ce!17924
| * | | | | | Bump `state_machines-activerecord` to `0.5.1`blackst0ne2018-03-264-77/+71
|/ / / / / /
* | | | | | Merge branch 'jej/fix-grape-protected-branch-fallback-removal' into 'master'Marin Jankovski2018-03-261-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] ProtectedBranch API omits empty declared params See merge request gitlab-org/gitlab-ce!17993
| * | | | | | ProtectedBranch API omits empty declared paramsJames Edwards-Jones2018-03-261-1/+2
| | | | | | |
* | | | | | | Merge branch 'docs-organize-by-category' into 'master'🚄 Job van der Voort 🚀2018-03-262-51/+115
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs organize main page by product category See merge request gitlab-org/gitlab-ce!17429
| * | | | | | | Docs organize main page by product categoryMarcia Ramos2018-03-262-51/+115
|/ / / / / / /
* | | | | | | Merge branch 'bug/44103-ie11-compatibility' into 'master'Fatih Acet2018-03-261-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Array.fill polyfill for IE 11 compatibility. Closes #44103 See merge request gitlab-org/gitlab-ce!17897
View Lorry Controller Status