summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update installation and upgrade guides to use Ruby 2.3.6docs/update-doc-for-ruby-2-3-6Rémy Coutable2017-12-204-8/+368
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '41186-sidebar-too-much-vertical-scroll' into 'master'Phil Hughes2017-12-206-55/+17
|\ | | | | | | | | | | | | Remove animations from dropdowns Closes #41186 See merge request gitlab-org/gitlab-ce!15968
| * Line up search dropdown with other nav dropdowns41186-sidebar-too-much-vertical-scrollAnnabel Dunstone Gray2017-12-192-8/+5
| |
| * Remove transitionend event from GL dropdownPhil Hughes2017-12-191-16/+8
| |
| * Remove block styling from search dropdownAnnabel Dunstone Gray2017-12-181-7/+0
| |
| * Fix sidebar height when performance bar enabledAnnabel Dunstone Gray2017-12-182-0/+6
| |
| * Remove all dropdown animations and set display: none if they're not openAnnabel Dunstone Gray2017-12-182-14/+2
| |
| * Remove extra height declarations in CSS; remove block styling from dropdownsAnnabel Dunstone Gray2017-12-184-15/+1
| |
* | Merge branch 'bvl-fix-unlinking-with-lfs-objects' into 'master'Douwe Maan2017-12-203-1/+27
|\ \ | | | | | | | | | | | | | | | | | | Don't link LFS-objects multiple times. Closes #41241 See merge request gitlab-org/gitlab-ce!16006
| * | Don't link LFS-objects multiple times.bvl-fix-unlinking-with-lfs-objectsBob Van Landuyt2017-12-193-1/+27
| | | | | | | | | | | | | | | | | | If Unlinking a fork would fail somewhere after this, the LFS objects might still be linked. Which would cause issues when trying to destroy a project.
* | | Merge branch '41264-gitlab-projects-spec-failures' into 'master'Robert Speicher2017-12-193-10/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix spec failures in spec/lib/gitlab/git/gitlab_projects_spec.rb Closes #41264 See merge request gitlab-org/gitlab-ce!16015
| * | | Prevent some specs from mangling the gitlab-shell checkoutNick Thomas2017-12-192-8/+5
| | | |
| * | | [CE->EE] Fix spec/lib/gitlab/git/gitlab_projects_spec.rbValery Sizov2017-12-191-2/+4
| |/ /
* | | Merge branch 'fix-onion-skin-reenter' into 'master'Jacob Schatz2017-12-193-13/+35
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix onion-skin re-entering state Closes #38533 See merge request gitlab-org/gitlab-ce!15815
| * | | Fix onion-skin re-entering stateClement Ho2017-12-193-13/+35
|/ / /
* | | Merge branch 'remove-links-mr-empty-state' into 'master'Jacob Schatz2017-12-197-14/+84
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove related links in MR widget when empty state Closes #36764 See merge request gitlab-org/gitlab-ce!15888
| * | | Remove related links in MR widget when empty stateClement Ho2017-12-197-14/+84
|/ / /
* | | Merge branch 'show-inline-edit-btn' into 'master'Jacob Schatz2017-12-197-21/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Show inline edit button for issues Closes #37474 See merge request gitlab-org/gitlab-ce!15812
| * | | Show inline edit button for issuesClement Ho2017-12-197-21/+10
|/ / /
* | | Merge branch '33028-event-tag-links' into 'master'Rémy Coutable2017-12-193-1/+62
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix tags in the Activity tab not being clickable Closes #33028 See merge request gitlab-org/gitlab-ce!15996
| * | | Fix tags in the Activity tab not being clickableMario de la Ossa2017-12-193-1/+62
|/ / /
* | | Merge branch '36020-private-npm-modules' into 'master'Douwe Maan2017-12-195-4/+81
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Do not generate links for private NPM modules in blob view Closes #36020 See merge request gitlab-org/gitlab-ce!16002
| * | | BlobViewer::PackageJson - if private link to homepageMario de la Ossa2017-12-183-7/+14
| | | |
| * | | Do not generate links for private NPM modules in blob viewMario de la Ossa2017-12-185-4/+74
| | | |
* | | | Merge branch 'zj-gitaly-pipelines-n-1' into 'master'Robert Speicher2017-12-1914-49/+184
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Improve performance of Pipelines#index.json See merge request gitlab-org/gitlab-ce!14846
| * | | | Load commit in batches for pipelines#indexZeger-Jan van de Weg2017-12-1914-49/+184
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses `list_commits_by_oid` on the CommitService, to request the needed commits for pipelines. These commits are needed to display the user that created the commit and the commit title. This includes fixes for tests failing that depended on the commit being `nil`. However, now these are batch loaded, this doesn't happen anymore and the commits are an instance of BatchLoader.
* | | | | Merge branch 'fix-docs-help-shortcut' into 'master'Phil Hughes2017-12-196-4/+53
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix shortcut links on help page Closes #41097 See merge request gitlab-org/gitlab-ce!16001
| * | | | | Fix shortcut links on help pageClement Ho2017-12-196-4/+53
|/ / / / /
* | | | | Merge branch 'fl-update-axios-docs' into 'master'Phil Hughes2017-12-191-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update axios.md See merge request gitlab-org/gitlab-ce!16008
| * \ \ \ \ Merge branch 'master' into fl-update-axios-docsFilipa Lacerda2017-12-192-38/+29
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Tidy up the documentation of Gitlab HA/Gitlab Application Make sure two except won't overwrite each other
| * | | | | | Update axios.mdfl-update-axios-docsFilipa Lacerda2017-12-191-1/+1
| | | | | | |
* | | | | | | Merge branch 'preserve-gem-path' into 'master'Rémy Coutable2017-12-191-1/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Preserve gem path so that we use the same gems See merge request gitlab-org/gitlab-ce!15986
| * | | | | | Preserve gem path so that we use the same gemspreserve-gem-pathLin Jen-Shin2017-12-191-1/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this patch, I would end up with: ``` An error occurred in a `before(:suite)` hook. Failure/Error: raise "could not connect to gitaly at #{socket.inspect} after #{sleep_time} seconds" RuntimeError: could not connect to gitaly at "tmp/tests/gitaly/gitaly.socket" after 10 seconds ``` Digging into it, it's because `scripts/gitaly-test-spawn` could not spawn the process, because it cannot find the installed gems. I personally installed all my gems under $HOME, namely with: * `gem install rake --user-install` or: * `bundle install --path ~/.gem` The gems would be installed to `~/.gem/ruby/2.4.0/gems`, where the version is Ruby ABI version. Now we're changing $HOME, making RubyGems think that the gems would be installed to `tmp/tests/ruby/2.4.0/gems` which is apparently not the case. In order to workaround this, we could preserve $GEM_PATH populated by RubyGems, ignoring the default path based on $HOME.
* | | | | | Merge branch 'docs/omnibus-2452-tidy-gitlab-application' into 'master'Marin Jankovski2017-12-191-12/+11
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Tidy up the documentation of Gitlab HA/Gitlab Application See merge request gitlab-org/gitlab-ce!16011
| * | | | | Tidy up the documentation of Gitlab HA/Gitlab ApplicationRichard Clamp2017-12-191-12/+11
|/ / / / /
* | | | | Merge branch 'except-qa-and-docs' into 'master'Grzegorz Bizon2017-12-191-26/+18
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Make sure two except won't overwrite each other See merge request gitlab-org/gitlab-ce!16010
| * | | | Make sure two except won't overwrite each otherLin Jen-Shin2017-12-191-26/+18
|/ / / / | | | | | | | | | | | | | | | | | | | | This is a pretty boring solution, but I can't think of a good idea right now and this might be good enough for now...
* | | | Merge branch 'fix-cluster-enviroment-missing' into 'master'Kamil Trzciński2017-12-198-0/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix cluster enviroment missing See merge request gitlab-org/gitlab-ce!15973
| * | | | Inverse the has_multiple_clusters? helper usagefix-cluster-enviroment-missingMatija Čupić2017-12-184-4/+4
| | | | |
| * | | | Hardcode clusters helper in CEMatija Čupić2017-12-181-1/+1
| | | | |
| * | | | Use helper for feature check in cluster partialsMatija Čupić2017-12-185-2/+15
| | | | |
| * | | | Revert save button caption changeMatija Čupić2017-12-161-1/+1
| | | | |
| * | | | Add environment scope field to cluster formsMatija Čupić2017-12-164-1/+8
| | | | |
| * | | | Allow environment_scope in cluster controllersMatija Čupić2017-12-163-0/+4
| | | | |
* | | | | Merge branch ↵Kamil Trzciński2017-12-191-19/+23
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41139-codequality-and-qa-internal-is-leaking-to-shared-runners' into 'master' Resolve "Codequality and qa:internal is leaking to Shared Runners" Closes #41139 See merge request gitlab-org/gitlab-ce!15957
| * | | | Use dedicated runners for all the CI jobs41139-codequality-and-qa-internal-is-leaking-to-shared-runnersRémy Coutable2017-12-181-19/+23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'sh-fix-milestone-id-migration' into 'master'Oswaldo Ferreira2017-12-191-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing WHERE clause in 20171106135924_issues_milestone_id_foreign_key migration Closes gitlab-com/infrastructure#3416 See merge request gitlab-org/gitlab-ce!15997
| * | | | | Fix missing WHERE clause in 20171106135924_issues_milestone_id_foreign_key ↵Stan Hu2017-12-181-0/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | migration If milestone_id is NULL, we shouldn't need to update it to be NULL again. This was causing us to touch almost all rows in the issues table for no good reason. Closes https://gitlab.com/gitlab-com/infrastructure/issues/3416
* | | | | Merge branch 'commit-diff-discussion-in-mr-context-fix-links' into 'master'41248-datetime_utility-calls-a-missing-lang-export-function-from-locale-index-js⛄️ Sean McGivern ⛄️2017-12-182-7/+22
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | fix the commit diff discussion sending the wrong url See merge request gitlab-org/gitlab-ce!15988
| * | | | rework the merge_request_version_params to use Object#tapcommit-diff-discussion-in-mr-context-fix-linksMicaël Bergeron2017-12-181-8/+4
| | | | |
View Lorry Controller Status