summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Flush the repository cache after GitHub importer runssh-fix-github-importer-cache-expiryStan Hu2017-12-053-0/+12
| | | | | | | This eliminates the need to wait for the FinishImportWorker to run and ensures that the repository is in a consistent state right away. Closes #40107
* Merge branch '40739-access-404' into 'master'Grzegorz Bizon2017-12-053-38/+66
|\ | | | | | | | | | | | | Prevent job link form rendering when user does not have permissions Closes #40739 See merge request gitlab-org/gitlab-ce!15723
| * Prevent job link form rendering when user does not have permissions40739-access-404Filipa Lacerda2017-12-043-38/+66
| | | | | | | | Adds e2e tests
* | Merge branch 'feature/migrate-cherry-pick-to-gitaly' into 'master'Robert Speicher2017-12-047-63/+144
|\ \ | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Repository#cherry_pick to Gitaly Closes gitaly#737 See merge request gitlab-org/gitlab-ce!15517
| * | Migrate Gitlab::Git::Repository#cherry_pick to GitalyAhmad Sherif2017-12-047-63/+144
| | | | | | | | | | | | Closes gitaly#737
* | | Merge branch 'user-agent-gke-api' into 'master'Kamil Trzciński2017-12-043-6/+35
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use custom User-Agent header in GCP Client requests Closes #40583 See merge request gitlab-org/gitlab-ce!15705
| * | | Add CHANGELOG entryuser-agent-gke-apiMatija Čupić2017-12-041-0/+5
| | | |
| * | | Refactor GCP Client#user_agent_header to use #tapMatija Čupić2017-12-041-3/+3
| | | |
| * | | Test usage of custom user agent in GCP ClientMatija Čupić2017-12-042-6/+10
| | | |
| * | | Use RequestOptions in GCP Client user_agent_headerMatija Čupić2017-12-042-3/+10
| | | |
| * | | Generate user agent header for GCP ClientMatija Čupić2017-12-042-0/+13
| | | |
* | | | Merge branch 'backstage/gb/improve-pipeline-chain-reduce-side-effects' into ↵40818-last-push-widget-does-not-appear-after-pushing-new-commit-to-a-branch-that-was-previously-merged-to-masterKamil Trzciński2017-12-041-7/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Reduce pipeline chain life span to minimize side effects See merge request gitlab-org/gitlab-ce!15716
| * | | | Reduce pipeline chain life span to minimize side effectsbackstage/gb/improve-pipeline-chain-reduce-side-effectsGrzegorz Bizon2017-12-041-7/+6
| | | | |
* | | | | Merge branch '39727-add-axios-to-common' into 'master'Phil Hughes2017-12-042-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Import axios utils in commons chunks See merge request gitlab-org/gitlab-ce!15721
| * | | | | Import axios utils in commons39727-add-axios-to-commonFilipa Lacerda2017-12-042-0/+6
| |/ / / /
* | | | | Merge branch '39869_show_closed_status_of_links_to_issues_on_wiki_pages' ↵Robert Speicher2017-12-043-2/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Show status of issuable links in wiki pages See merge request gitlab-org/gitlab-ce!15694
| * | | | | show status of issue links in wiki pagehaseeb2017-12-043-2/+13
|/ / / / /
* | | | | Merge branch 'psimyn-issue-note-refac' into 'master'Fatih Acet2017-12-0421-78/+77
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | issue note component rename See merge request gitlab-org/gitlab-ce!15587
| * | | | | issue note component renameSimon Knox2017-12-0421-78/+77
|/ / / / /
* | | | | Merge branch 'git-fsck-worker-client-prep' into 'master'Douwe Maan2017-12-042-11/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move SingleRepositoryWorker#fsck into Gitlab::Git::Repository Closes gitaly#802 See merge request gitlab-org/gitlab-ce!15710
| * | | | | Move SingleRepositoryWorker#fsck into Gitlab::Git::RepositoryKim "BKC" Carlbäcker2017-12-042-11/+17
| | |/ / / | |/| | |
* | | | | Merge branch 'zj-diverging-commit-count-no-rugged' into 'master'Robert Speicher2017-12-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use commit finder instead of rev parse See merge request gitlab-org/gitlab-ce!15683
| * | | | | Use commit finder instead of rev parseZeger-Jan van de Weg2017-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has the side effect of making this method rugged call free, which is the reason I actually changed this.
* | | | | | Merge branch 'sh-optimize-groups-api' into 'master'Douwe Maan2017-12-0418-32/+241
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize API /groups/:id/projects by preloading assocations Closes #40308 See merge request gitlab-org/gitlab-ce!15475
| * | | | | | Fixed bugsh-optimize-groups-apiFrancisco Lopez2017-12-042-2/+17
| | | | | | |
| * | | | | | Moving query to base count serviceFrancisco Lopez2017-12-043-8/+4
| | | | | | |
| * | | | | | Not forcing to redefine preload_relationFrancisco Lopez2017-12-011-1/+1
| | | | | | |
| * | | | | | Using map to retrieve the element ids because of some issues with mysqlFrancisco Lopez2017-12-013-4/+9
| | | | | | |
| * | | | | | Fixed testFrancisco Lopez2017-12-011-2/+1
| | | | | | |
| * | | | | | Undoing the change to ForkNetworkMemberFrancisco Lopez2017-12-012-12/+11
| | | | | | |
| * | | | | | Fixed BasicProjectDetail parentFrancisco Lopez2017-12-011-1/+1
| | | | | | |
| * | | | | | Removed binding.pryFrancisco Lopez2017-12-011-1/+0
| | | | | | |
| * | | | | | Removing blank lineFrancisco Lopez2017-12-011-1/+0
| | | | | | |
| * | | | | | Changes after rebaseFrancisco Lopez2017-12-011-3/+14
| | | | | | |
| * | | | | | Undoing debugging changeFrancisco Lopez2017-12-011-2/+2
| | | | | | |
| * | | | | | Comments from code review applied. Also switched forked_from_project and ↵Francisco Lopez2017-12-0112-73/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ForkedProjectLinks to ForkNetworkMember
| * | | | | | Refactored /projects and /user/:user_id/projects endpointsFrancisco Lopez2017-12-014-25/+77
| | | | | | |
| * | | | | | Code review comments appliedFrancisco Lopez2017-12-013-4/+12
| | | | | | |
| * | | | | | Small renamingFrancisco Lopez2017-12-011-4/+4
| | | | | | |
| * | | | | | More preloading improvement and added batch count servicesFrancisco Lopez2017-12-016-7/+88
| | | | | | |
| * | | | | | Fix CHANGELOG entry to mention all associations, not just fork networksStan Hu2017-12-011-1/+1
| | | | | | |
| * | | | | | Preload project route to avoid N+1 queryStan Hu2017-12-011-1/+1
| | | | | | |
| * | | | | | Only serialize namespace essentials in group's projects API responseStan Hu2017-12-011-2/+4
| | | | | | |
| * | | | | | Omit the `all` call after Project#project_group_links to avoid unnecessary loadsStan Hu2017-12-011-1/+1
| | | | | | |
| * | | | | | Optimize API /groups/:id/projects by preloading associationsStan Hu2017-12-013-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #40308
* | | | | | | Merge branch '40691-upgrade-rails-to-4-2-10' into 'master'Douwe Maan2017-12-043-41/+42
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Upgrade Rails to 4.2.10" Closes #40691 See merge request gitlab-org/gitlab-ce!15662
| * | | | | | | Stop calling #strip in a commit title in Notify specs40691-upgrade-rails-to-4-2-10Rémy Coutable2017-12-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Update Rails to 4.2.10Rémy Coutable2017-12-012-39/+40
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes since 4.2.8: - [No change in ActionMailer](https://github.com/rails/rails/blob/v4.2.10/actionmailer/CHANGELOG.md) - [1 change and 1 regression fix in ActionPack](https://github.com/rails/rails/blob/v4.2.10/actionpack/CHANGELOG.md) - [No change in ActiveModel](https://github.com/rails/rails/blob/v4.2.10/activemodel/CHANGELOG.md) - [7 fixes in ActiveRecord](https://github.com/rails/rails/blob/v4.2.10/activerecord/CHANGELOG.md) - [5 fixes in ActiveSupport](https://github.com/rails/rails/blob/v4.2.10/activesupport/CHANGELOG.md) - [No change in Railties](https://github.com/rails/rails/blob/v4.2.10/railties/CHANGELOG.md) Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'gollum-initializer-warning' into 'master'Rémy Coutable2017-12-041-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add notice to Gollum initializer See merge request gitlab-org/gitlab-ce!15713
| * | | | | | | Add notice to gollum initializergollum-initializer-warningJacob Vosmaer2017-12-041-0/+4
| | | | | | | |
View Lorry Controller Status