summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update GitLab Shell to v8.7.1nick.thomas/gitlab-ce-shell-8-7Nick Thomas2019-03-062-1/+6
|
* Merge branch 'feature/api-delete-job-artifacts' into 'master'Kamil Trzciński2019-03-066-22/+118
|\ | | | | | | | | API: delete job_artifacts of a single job See merge request gitlab-org/gitlab-ce!25522
| * API: delete job_artifacts of a single jobRoger Rüttimann2019-03-066-22/+118
|/
* Merge branch 'docs/fix-spelling-in-new-variables' into 'master'Kamil Trzciński2019-03-061-1/+1
|\ | | | | | | | | Fix spelling and other minor improvements See merge request gitlab-org/gitlab-ce!25784
| * Fix spelling and other minor improvementsEvan Read2019-03-061-1/+1
|/
* Merge branch '45035-force-push-api' into 'master'Nick Thomas2019-03-0612-17/+53
|\ | | | | | | | | | | | | Accept force option on commit via API Closes #45035 See merge request gitlab-org/gitlab-ce!25286
| * Accept force option on commit via APIPatrick Bajao2019-03-0612-17/+53
|/ | | | | | | | When `force` is set to `true` and `start_branch` is set, the branch will be ovewritten with the new commit based on the `HEAD` of the `start_branch`. This commit includes changes to update the `gitaly-proto` gem.
* Merge branch 'ce-9445-kerberos-clone-url-is-no-longer-visible' into 'master'Kushal Pandya2019-03-062-2/+4
|\ | | | | | | | | Backport Kerberos clone URL to CE See merge request gitlab-org/gitlab-ce!25750
| * Backport Kerberos clone URL to CEDennis Tang2019-03-042-2/+4
| |
* | Merge branch 'contribute/fix-issue-board-weekday-shift' into 'master'Kushal Pandya2019-03-063-3/+8
|\ \ | | | | | | | | | | | | | | | | | | Remove timezone conversion of issue due dates for issue board cards Closes #56251 See merge request gitlab-org/gitlab-ce!25512
| * | Remove timezone conversion of issue due dates for issue board cardsElias Werberich2019-02-253-3/+8
| | |
* | | Merge branch 'patch-1' into 'master'Evan Read2019-03-061-3/+3
|\ \ \ | | | | | | | | | | | | | | | | Fixed incorrect include key See merge request gitlab-org/gitlab-ce!25766
| * | | Fixed incorrect include keyLaurens Stötzel2019-03-061-3/+3
|/ / /
* | | Merge branch 'gitlab-ui-2.1.1' into 'master'Kushal Pandya2019-03-062-11/+21
|\ \ \ | | | | | | | | | | | | | | | | Update gitlab-ui to 2.1.1 See merge request gitlab-org/gitlab-ce!25785
| * | | Update gitlab-ui to 2.1.1Clement Ho2019-03-062-11/+21
|/ / /
* | | Merge branch 'fix/38010-sidebar-loads-and-collapses' into 'master'Fatih Acet2019-03-0611-84/+258
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Updated ContextualSidebar to render collapsed on smaller screens Closes #38010 See merge request gitlab-org/gitlab-ce!24555
| * | | Align nav-sidebar with design.gitlab.com docsEzekiel Kigbo2019-03-054-67/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated nav-sidebar to reflect the documented behaviour from the design.gitlab.com docs: https://design.gitlab.com/regions/navigation#contextual-navigation Updated rspec tests to reflect the expected behaviour
| * | | Fix collapsing behaviour at 1200pxEzekiel Kigbo2019-03-053-29/+27
| | | |
| * | | Removed force toggle .nav-sidebar on any click eventEzekiel Kigbo2019-03-052-11/+6
| | | | | | | | | | | | | | | | Added note describing expected behaviour
| * | | Added test for interacting with the nav-sidebar on smaller screensEzekiel Kigbo2019-03-053-13/+98
| | | | | | | | | | | | | | | | Use mobile collapsing behaviour at width 1200px
| * | | Updated nav-sidebar to collapse on loadEzekiel Kigbo2019-03-058-71/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the collapsed mixin to the styling for .nav-sidebar ensuring the nav-sidebar is collapsed on load via media queries. Removes the need for an intermediate class to collapse the sidebar on mobile viewports Updated toggleCollapsedSidebar to check for desktop breakpoint
| * | | Added DESKTOP_BREAKPOINTS constantEzekiel Kigbo2019-03-051-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Chore: ensure sidebar-expanded-mobile toggles Revert: toggleCollapseSidebar should not be called on xs breakpoints
| * | | Add tests for nav sidebar collapsed on renderLuke Bennett2019-03-056-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds rspec view tests that expect the nav sidebar to have a class that will cause the nav sidebar to be rendered collapsed with or without js. Tests the nav sidebar on the admin, group, instance statistics, user profile and project sidebars.
| * | | Fixed navigation sidebar flashing open on page loadEzekiel2019-03-058-14/+59
| | | | | | | | | | | | | | | | | | | | | | | | Adds the sidebar-collapsed-mobile class to the haml layouts and sets media queries to display the sidebar collapsed by default for sreen sizes greater than `sm` and less than `lg`
* | | | Merge branch '52792-align-mirror-repository-button' into 'master'Clement Ho2019-03-053-5/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: Repository mirrors table border and padding Closes #52792 See merge request gitlab-org/gitlab-ce!25606
| * | | | Add changelog entryealcantara2019-03-051-0/+5
| | | | |
| * | | | Delete class selector that removes right paddingealcantara2019-03-052-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Delete mirror-action-buttons class that removes right padding from repository mirror action buttons
* | | | | Merge branch '58503-fix-qa-auto-devops' into 'master'Dan Davison2019-03-051-9/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix QA Auto DevOps push after adding cluster Closes #58503 See merge request gitlab-org/gitlab-ce!25782
| * | | | | Fix QA Auto DevOps push after adding clusterDylan Griffith2019-03-061-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessary because otherwise the push will trigger a pipeline that does not include a production deployment job.
* | | | | | Merge branch 'test-57693-download-mr-patch-diffs' into 'master'Mark Lapierre2019-03-055-3/+65
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add QA test to download merge request patch/diffs See merge request gitlab-org/gitlab-ce!25451
| * | | | | | Add QA test to download merge request patch/diffsLinda Dai2019-03-055-3/+65
|/ / / / / /
* | | | | | Merge branch 'fix/gb/fix-bridge-jobs-variables-policy' into 'master'Stan Hu2019-03-0510-153/+226
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bridge jobs only/except variables policy Closes #58199 See merge request gitlab-org/gitlab-ce!25710
| * | | | | Fix CI/CD bridge variables unit testGrzegorz Bizon2019-03-021-14/+8
| | | | | |
| * | | | | Add test for evaluating bridge variables policyGrzegorz Bizon2019-03-021-0/+21
| | | | | |
| * | | | | Add changelog for bridge jobs variables policy fixGrzegorz Bizon2019-03-021-0/+5
| | | | | |
| * | | | | Extract scoped CI/CD variables to a separate concernGrzegorz Bizon2019-03-024-142/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commits extract code responsible for calculating essential CI/CD variables to a separate concern. This makes it possible to share this code between a `Ci::Build` and a `Ci::Bridge`. We might want to refactor this to use composition instead of inheritance.
| * | | | | Do not raise when adding undefined variables resourceGrzegorz Bizon2019-03-022-0/+10
| | | | | |
| * | | | | Move ref slug helper to HasRef moduleGrzegorz Bizon2019-03-023-11/+12
| | | | | |
| * | | | | Require scoped variables for a CI/CD processable entityGrzegorz Bizon2019-03-021-0/+4
| | | | | |
* | | | | | Merge branch ↵Filipa Lacerda2019-03-0513-17/+392
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '27333-re-deploy-rollback-button-should-ask-for-confirmation-before-executing' into 'master' Ask for confirmation before re-deploying/rolling back Closes #27333 See merge request gitlab-org/gitlab-ce!25110
| * | | | | | Add Component to Confirm Environment RollbackAndrew Fontaine2019-03-0513-17/+392
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure a vue.js component to confirm the re-deployment/rollback of an environment pops up when rollback/re-deploy has been clicked so the user must confirm their actions before accidentally rolling back or re-deploying an environment. Only on the `environment-table` view.
* | | | | | Merge branch '56851-error-tracking-page-seems-broken' into 'master'Filipa Lacerda2019-03-055-14/+62
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Error tracking page seems broken" Closes #56851 See merge request gitlab-org/gitlab-ce!24806
| * | | | | | Fix error tracking page, not showing an empty stateJose Vargas2019-03-015-14/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR adds a missing empty state for when a backend response contains an empty error list, it shows the table but with `no data to display` empty state, also adds a reload button that allows to refresh for data
* | | | | | | Merge branch ↵Filipa Lacerda2019-03-054-14/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '32714-copying-comment-with-ordered-list-includes-extraneous-newlines' into 'master' Resolve "Copying comment with ordered list includes extraneous newlines" Closes #32714 See merge request gitlab-org/gitlab-ce!25695
| * | | | | | | Added tightLists option to copy_as_gfm markdown serializerConstance Okoghenun2019-03-054-14/+10
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes extraneous newlines when copying comments with an ordered list.
* | | | | | | Merge branch 'add-efs-warning-to-requirements' into 'master'Mike Lewis2019-03-051-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding EFS warning to requirements See merge request gitlab-org/gitlab-ce!25754
| * | | | | | | Adding NFS warning to requirementsEric Johnson2019-03-051-0/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'check_pg_stat_activity' into 'master'Stan Hu2019-03-051-0/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show pg_stat_activity before each test run See merge request gitlab-org/gitlab-ce!25723
| * | | | | | | Show pg_stat_activity before each test runThong Kuah2019-03-051-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Maybe this will help us debug https://gitlab.com/gitlab-org/gitlab-ee/issues/10154
* | | | | | | | Merge branch '56809-graphql-version-api' into 'master'Douwe Maan2019-03-0514-5/+171
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add metadata about the GitLab server to GraphQL See merge request gitlab-org/gitlab-ce!24636
View Lorry Controller Status