summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Don't attempt to override a `set` with a `let`rs-ci-build-spec-warningsRobert Speicher2018-03-141-8/+8
|
* Don't use `not_to raise_error(SomeError)`Robert Speicher2018-03-141-1/+1
|
* Merge branch 'update-fog-aws' into 'master'Robert Speicher2018-03-142-6/+6
|\ | | | | | | | | update fog-aws 1.4 -> 2.0 See merge request gitlab-org/gitlab-ce!17708
| * update fog-aws 1.4 -> 2.0Pirate Praveen2018-03-132-6/+6
| |
* | Merge branch 'update-acts-as-taggable-on' into 'master'Robert Speicher2018-03-142-6/+6
|\ \ | | | | | | | | | | | | Update acts-as-taggable-on to 5.0 See merge request gitlab-org/gitlab-ce!17689
| * | Update acts-as-taggable-on to 5.0Pirate Praveen2018-03-122-6/+6
| | | | | | | | | | | | - only older ruby and activerecord support dropped
* | | Merge branch 'update-sentry-raven' into 'master'Douwe Maan2018-03-142-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update sentry-raven 2.5.3 -> 2.7 (Fixes #24029) Closes #24029 See merge request gitlab-org/gitlab-ce!17709
| * | | Update sentry-raven 2.5.3 -> 2.7 (Fixes #24029)Pirate Praveen2018-03-132-3/+3
| |/ /
* | | Merge branch 'update-octokit' into 'master'Douwe Maan2018-03-142-3/+3
|\ \ \ | | | | | | | | | | | | | | | | Update octokit 4.6.2 -> 4.8 See merge request gitlab-org/gitlab-ce!17738
| * | | Update octokit 4.6.2 -> 4.8Pirate Praveen2018-03-142-3/+3
| | | |
* | | | Merge branch 'update-ruby-prof' into 'master'Robert Speicher2018-03-142-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update ruby-prof 0.16.2 -> 0.17.0 See merge request gitlab-org/gitlab-ce!17710
| * | | | Update ruby-prof 0.16.2 -> 0.17.0Pirate Praveen2018-03-132-3/+3
| | |/ / | |/| |
* | | | Merge branch 'update-httparty' into 'master'Grzegorz Bizon2018-03-142-4/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update httparty 0.13.3 -> 0.15.6 See merge request gitlab-org/gitlab-ce!17737
| * | | | Update httparty 0.13.3 -> 0.15.6Pirate Praveen2018-03-142-4/+3
| | |/ / | |/| |
* | | | Merge branch 'bvl-import-zip-multiple-assignees' into 'master'Sean McGivern2018-03-144-15/+42
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import multiple issue assignees from GitLab export Closes #40275 See merge request gitlab-org/gitlab-ce!17718
| * | | | Import multiple issue assignees from GitLab exportBob Van Landuyt2018-03-144-15/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When importing from a GitLab archive, an admin can carry over the assignations. Other users can not. When a regular user is importing an issue with multiple assignees, the assignee is replaced with the current user, meaning we would try to insert current user as an assignee multiple times. By filtering the array before storing it, the import becomes more robust.
* | | | | Merge branch '43717-breadcrumb-on-admin-runner-page' into 'master'Sean McGivern2018-03-142-0/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Breadcrumb on Admin Runner page Closes #43717 See merge request gitlab-org/gitlab-ce!17431
| * | | | | Set breadcrumb for admin/runners/showTakuya Noguchi2018-03-142-0/+9
| | | | | |
* | | | | | Merge branch '44160-update-foreman-to-0.84.0' into 'master'Grzegorz Bizon2018-03-143-3/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update foreman to 0.84.0 Closes #44160 See merge request gitlab-org/gitlab-ce!17690
| * | | | | | Update foreman from 0.78.0 to 0.84.0Takuya Noguchi2018-03-133-3/+8
| | | | | | |
* | | | | | | Merge branch 'patch-29' into 'master'Sean McGivern2018-03-141-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Incoming e-mails: require gitlab-ctl restart See merge request gitlab-org/gitlab-ce!17587
| * | | | | | | Docs: Incoming e-mails: require gitlab-ctl restartDamian Nowak2018-03-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/23560#note_61966788
* | | | | | | | Merge branch 'mr-widget-deployment-styling' into 'master'Filipa Lacerda2018-03-149-345/+393
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix styling of multiple environments in merge request widget Closes #40610 See merge request gitlab-org/gitlab-ce!17663
| * | | | | | | | fixed deployment rspecmr-widget-deployment-stylingPhil Hughes2018-03-141-1/+1
| | | | | | | | |
| * | | | | | | | removed useless v-ifPhil Hughes2018-03-145-55/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed pointless test & changed some deployment tests to make more sense added in v-tooltip
| * | | | | | | | improved markupPhil Hughes2018-03-131-24/+20
| | | | | | | | |
| * | | | | | | | fixed breakpointPhil Hughes2018-03-132-46/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disable stop button when loading
| * | | | | | | | fixed scss-lintPhil Hughes2018-03-131-4/+2
| | | | | | | | |
| * | | | | | | | fixed eslintPhil Hughes2018-03-132-11/+2
| | | | | | | | |
| * | | | | | | | adjust styling to remove gapsPhil Hughes2018-03-131-1/+21
| | | | | | | | |
| * | | | | | | | updated specsPhil Hughes2018-03-134-198/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | Fix styling of multiple environments in merge request widgetPhil Hughes2018-03-135-120/+162
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Closes #40610
* | | | | | | | Merge branch 'zj-create-repo-opt-out' into 'master'Sean McGivern2018-03-1413-30/+31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move CreateRepository to OPT_OUT for Gitaly See merge request gitlab-org/gitlab-ce!17740
| * | | | | | | | Set Gitlab::Shell#create_repository as OPT_OUTZeger-Jan van de Weg2018-03-141-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On .com repositories are created through Gitaly for a while now. For customers this is not the case unless these have chosen to do so through feature flags. By moving this to opt out, everyone will be using this. This move is part of the migration issue https://gitlab.com/gitlab-org/gitaly/issues/593 The bigger impact this commit will have is that tests that use a repository through `FactoryBot.create(:project, :repository)` will now use Gitaly to do so. As tests run on the same disk, or at least machine, this will most probably slow them down.
| * | | | | | | | Change Gitlab::Shell#add_namespace to #create_namespaceZeger-Jan van de Weg2018-03-1413-26/+26
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this change, this method was called add_namespace, which broke the CRUD convention and made it harder to grep for what I was looking for. Given the change was a find and replace kind of fix, this was changed without opening an issue and on another feature branch. If more dynamic calls are made to add_namespace, these could've been missed which might lead to incorrect bahaviour. However, going through the commit log it seems thats not the case.
* | | | | | | | Merge branch 'projects-graphs-rspec' into 'master'Grzegorz Bizon2018-03-143-83/+75
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace project graphs spinach tests with RSpec analog See merge request gitlab-org/gitlab-ce!17675
| * | | | | | | | Replace project graphs spinach tests with RSpec analogSemyon Pupkov2018-03-143-83/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | | | | | | Merge branch 'project-redirects-rspec' into 'master'Lin Jen-Shin2018-03-143-105/+74
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace project redirects spinach tests with RSpec analog See merge request gitlab-org/gitlab-ce!17676
| * | | | | | | | | Replace project redirects spinach tests with RSpec analogSemyon Pupkov2018-03-143-105/+74
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | | | | | | Merge branch 'fix-emoji-popup' into 'master'Sean McGivern2018-03-142-2/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide emoji popup after multiple spaces or blank lines, closes #40620,#33678 Closes #40620 and #33678 See merge request gitlab-org/gitlab-ce!17680
| * | | | | | | | | Hide emoji popup after multiple spaces or blank linesJan Beckmann2018-03-112-2/+6
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #40620,#33678
* | | | | | | | | Merge branch 'backstage/gb/add-pipeline-build-variables-tests' into 'master'Kamil Trzciński2018-03-142-39/+90
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Improve tests for predefined variables See merge request gitlab-org/gitlab-ce!17597
| * | | | | | | | Remove enforcing uniqueness of build variablesbackstage/gb/add-pipeline-build-variables-testsGrzegorz Bizon2018-03-072-10/+9
| | | | | | | | |
| * | | | | | | | Improve pipeline tests for variables to test orderingGrzegorz Bizon2018-03-071-3/+3
| | | | | | | | |
| * | | | | | | | Improve tests for predefined variables for a buildGrzegorz Bizon2018-03-072-37/+89
| | | | | | | | |
* | | | | | | | | Merge branch 'revert-238781a6' into 'master'Robert Speicher2018-03-131-2/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'sh-filter-secret-variables' into 'master'" See merge request gitlab-org/gitlab-ce!17733
| * | | | | | | | | Revert "Merge branch 'sh-filter-secret-variables' into 'master'"Stan Hu2018-03-131-2/+0
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | This reverts merge request !17159
* | | | | | | | | Merge branch 'pages-0-7-1' into 'master'Robert Speicher2018-03-131-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade GitLab Pages to v0.7.1 See merge request gitlab-org/gitlab-ce!17732
| * | | | | | | | | Upgrade GitLab Pages to v0.7.1Nick Thomas2018-03-131-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch '44024-fix-table-extra-column' into 'master'Clement Ho2018-03-133-2/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix markdown table showing extra fake column v1 Closes #44024 See merge request gitlab-org/gitlab-ce!17669
View Lorry Controller Status