Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update the Documentation MR templateupdate-docs-mr-template | Achilleas Pipinellis | 2018-03-27 | 1 | -7/+20 |
| | | | | [ci skip] | ||||
* | Merge branch 'dz-improve-app-settings' into 'master' | Filipa Lacerda | 2018-03-26 | 11 | -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 animation | Dmitriy Zaporozhets | 2018-03-26 | 6 | -222/+237 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Remove gray background from app setting expandable sections | Dmitriy Zaporozhets | 2018-03-26 | 7 | -24/+18 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Improve application settings page according to feedback | Dmitriy Zaporozhets | 2018-03-26 | 7 | -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-settings | Dmitriy Zaporozhets | 2018-03-26 | 11 | -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ński | 2018-03-26 | 21 | -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-refactoring | Grzegorz Bizon | 2018-03-26 | 1 | -4/+4 |
| | | | |||||
| * | | Remove outdates TODOs from pipeline class | Grzegorz Bizon | 2018-03-23 | 1 | -4/+0 |
| | | | |||||
| * | | Add specs for extracted pipeline-related methods | Grzegorz Bizon | 2018-03-22 | 1 | -0/+18 |
| | | | |||||
| * | | Bring seeds size method back to CI/CD pipeline class | Grzegorz Bizon | 2018-03-22 | 2 | -0/+21 |
| | | | |||||
| * | | Improve YAML processor specs and remove unused code | Grzegorz Bizon | 2018-03-22 | 1 | -29/+25 |
| | | | |||||
| * | | Fix static analysis and tests related to YAML processing | Grzegorz Bizon | 2018-03-22 | 5 | -67/+103 |
| | | | |||||
| * | | Add specs for pipeline chain that builds stages and jobs | Grzegorz Bizon | 2018-03-22 | 4 | -11/+52 |
| | | | |||||
| * | | Do not select included stage seeds in populate chain | Grzegorz Bizon | 2018-03-22 | 1 | -5/+2 |
| | | | |||||
| * | | Decouple YAML processor from pipeline objects | Grzegorz Bizon | 2018-03-22 | 3 | -57/+43 |
| | | | |||||
| * | | Move policy related specs our of YAML processor tests | Grzegorz Bizon | 2018-03-22 | 7 | -580/+534 |
| | | | |||||
| * | | Fix rubocop offense in pipeline build seed class | Grzegorz Bizon | 2018-03-22 | 1 | -13/+11 |
| | | | |||||
| * | | Add a guard clause to avoid creating empty stages | Grzegorz Bizon | 2018-03-21 | 1 | -0/+3 |
| | | | |||||
| * | | Evaluate only/except policies outside of YAML processor | Grzegorz Bizon | 2018-03-21 | 4 | -12/+62 |
| | | | |||||
| * | | Make it easier to test pipeline stage seeds | Grzegorz Bizon | 2018-03-21 | 8 | -36/+39 |
| | | | |||||
| * | | Reduce stage seeds coupling between pipeline and YAML | Grzegorz Bizon | 2018-03-21 | 6 | -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 pipeline | Grzegorz Bizon | 2018-03-21 | 3 | -23/+126 |
| | | | |||||
| * | | Populate pipeline with objects before creating it | Grzegorz Bizon | 2018-03-21 | 6 | -17/+47 |
| | | | |||||
| * | | Remove legacy service for creating pipeline stages | Grzegorz Bizon | 2018-03-21 | 5 | -24/+9 |
| | | | |||||
| * | | Decouple pipeline stage seeds from building environments | Grzegorz Bizon | 2018-03-21 | 4 | -18/+21 |
| | | | |||||
| * | | Support building all pipeline resource before saving | Grzegorz Bizon | 2018-03-21 | 4 | -30/+36 |
| | | | |||||
| * | | Introduce pipeline build seeds | Grzegorz Bizon | 2018-03-21 | 5 | -29/+63 |
| | | | |||||
| * | | Start building abstraction over pipeline seeds | Grzegorz Bizon | 2018-03-21 | 6 | -69/+90 |
| | | | |||||
| * | | Instantiate pipeline stages and builds before saving | Grzegorz Bizon | 2018-03-19 | 3 | -37/+41 |
| | | | |||||
* | | | Merge branch 'update-omniauth-twitter' into 'master' | Douwe Maan | 2018-03-26 | 2 | -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.4 | Pirate Praveen | 2018-03-20 | 2 | -5/+5 |
| | | | | |||||
* | | | | Merge branch '43552-user-owned-projects-query-performance-improvement' into ↵ | Douwe Maan | 2018-03-26 | 2 | -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 performance | Tiago Botelho | 2018-03-26 | 2 | -3/+15 |
| | | | | | |||||
* | | | | | Merge branch ↵ | Grzegorz Bizon | 2018-03-26 | 15 | -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-request | YarNayar | 2018-03-26 | 15 | -10/+154 |
| | | | | | | | | | | | | | | | | | | | | | | | | Closes #23460 | ||||
* | | | | | | Merge branch 'blackst0ne-rails5-update-state_machines-activerecord-gem' into ↵ | Douwe Maan | 2018-03-26 | 4 | -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` | blackst0ne | 2018-03-26 | 4 | -77/+71 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'jej/fix-grape-protected-branch-fallback-removal' into 'master' | Marin Jankovski | 2018-03-26 | 1 | -1/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] ProtectedBranch API omits empty declared params See merge request gitlab-org/gitlab-ce!17993 | ||||
| * | | | | | | ProtectedBranch API omits empty declared params | James Edwards-Jones | 2018-03-26 | 1 | -1/+2 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'docs-organize-by-category' into 'master' | 🚄 Job van der Voort 🚀 | 2018-03-26 | 2 | -51/+115 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs organize main page by product category See merge request gitlab-org/gitlab-ce!17429 | ||||
| * | | | | | | | Docs organize main page by product category | Marcia Ramos | 2018-03-26 | 2 | -51/+115 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'bug/44103-ie11-compatibility' into 'master' | Fatih Acet | 2018-03-26 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Array.fill polyfill for IE 11 compatibility. Closes #44103 See merge request gitlab-org/gitlab-ce!17897 | ||||
| * | | | | | | Add Array.fill for IE 11 compatibility. | Pei-Tang Huang | 2018-03-22 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'ide-diff-cursor' into 'master' | Tim Zallmann | 2018-03-26 | 3 | -0/+12 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable cursor for review mode in the IDE Closes #44307 See merge request gitlab-org/gitlab-ce!17955 | ||||
| * | | | | | | | Disable cursor for review mode in the IDEide-diff-cursor | Phil Hughes | 2018-03-23 | 3 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also disables occurrences highlights & the line highlight for the review mode. Closes #44307 | ||||
* | | | | | | | | Merge branch ↵ | Kamil Trzciński | 2018-03-26 | 13 | -22/+35 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43316-controller-parameters-handling-sensitive-information-should-use-a-more-specific-name' into 'master' Resolve "Controller parameters handling sensitive information should use a more specific name" Closes #43316 See merge request gitlab-org/gitlab-ce!17796 | ||||
| * | | | | | | | | Make Variable key not secret43316-controller-parameters-handling-sensitive-information-should-use-a-more-specific-name | Matija Čupić | 2018-03-22 | 12 | -24/+21 |
| | | | | | | | | | |||||
| * | | | | | | | | Revert "Filter secret CI variable values from logs" | Matija Čupić | 2018-03-19 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ddeefbdd24119fff5bb3c770f9a285f28ca31914. | ||||
| * | | | | | | | | Check for secret_key and secret_value in CI Variable native list js spec | Matija Čupić | 2018-03-17 | 1 | -2/+2 |
| | | | | | | | | |