Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Init zenmode in snippets pages40508-snippets-zen-mode | Filipa Lacerda | 2017-12-05 | 4 | -1/+15 |
| | |||||
* | Merge branch 'ce-1379-update-sidebar-weight-to-vue-and-add-to-boards' into ↵ | Phil Hughes | 2017-12-05 | 11 | -131/+249 |
|\ | | | | | | | | | | | | | 'master' Backport EE changes from refactor sidebar weight block Vue and move to Issue Boards See merge request gitlab-org/gitlab-ce!15706 | ||||
| * | Backport changes from refactor sidebar weight block Vue and move to Issue Boardsce-1379-update-sidebar-weight-to-vue-and-add-to-boards | Eric Eastwood | 2017-12-04 | 11 | -131/+249 |
| | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3566 | ||||
* | | Merge branch '39367-fix-new-email-session-path' into 'master' | Douwe Maan | 2017-12-05 | 7 | -11/+16 |
|\ \ | | | | | | | | | | | | | | | | | | | remove ambiguity about which resource type to be using for new sessions Closes #39367 See merge request gitlab-org/gitlab-ce!15726 | ||||
| * | | remove ambiguity about which resource type to be using for new sessions | Brett Walker | 2017-12-05 | 7 | -11/+16 |
|/ / | |||||
* | | Merge branch '40739-access-404' into 'master' | Grzegorz Bizon | 2017-12-05 | 3 | -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-404 | Filipa Lacerda | 2017-12-04 | 3 | -38/+66 |
| | | | | | | | | | | | | Adds e2e tests | ||||
* | | | Merge branch 'feature/migrate-cherry-pick-to-gitaly' into 'master' | Robert Speicher | 2017-12-04 | 7 | -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 Gitaly | Ahmad Sherif | 2017-12-04 | 7 | -63/+144 |
| | | | | | | | | | | | | | | | | Closes gitaly#737 | ||||
* | | | | Merge branch 'user-agent-gke-api' into 'master' | Kamil Trzciński | 2017-12-04 | 3 | -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-api | Matija Čupić | 2017-12-04 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | Refactor GCP Client#user_agent_header to use #tap | Matija Čupić | 2017-12-04 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Test usage of custom user agent in GCP Client | Matija Čupić | 2017-12-04 | 2 | -6/+10 |
| | | | | | |||||
| * | | | | Use RequestOptions in GCP Client user_agent_header | Matija Čupić | 2017-12-04 | 2 | -3/+10 |
| | | | | | |||||
| * | | | | Generate user agent header for GCP Client | Matija Čupić | 2017-12-04 | 2 | -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-master | Kamil Trzciński | 2017-12-04 | 1 | -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-effects | Grzegorz Bizon | 2017-12-04 | 1 | -7/+6 |
| | | | | | |||||
* | | | | | Merge branch '39727-add-axios-to-common' into 'master' | Phil Hughes | 2017-12-04 | 2 | -0/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Import axios utils in commons chunks See merge request gitlab-org/gitlab-ce!15721 | ||||
| * | | | | | Import axios utils in commons39727-add-axios-to-common | Filipa Lacerda | 2017-12-04 | 2 | -0/+6 |
| |/ / / / | |||||
* | | | | | Merge branch '39869_show_closed_status_of_links_to_issues_on_wiki_pages' ↵ | Robert Speicher | 2017-12-04 | 3 | -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 page | haseeb | 2017-12-04 | 3 | -2/+13 |
|/ / / / / | |||||
* | | | | | Merge branch 'psimyn-issue-note-refac' into 'master' | Fatih Acet | 2017-12-04 | 21 | -78/+77 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | issue note component rename See merge request gitlab-org/gitlab-ce!15587 | ||||
| * | | | | | issue note component rename | Simon Knox | 2017-12-04 | 21 | -78/+77 |
|/ / / / / | |||||
* | | | | | Merge branch 'git-fsck-worker-client-prep' into 'master' | Douwe Maan | 2017-12-04 | 2 | -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::Repository | Kim "BKC" Carlbäcker | 2017-12-04 | 2 | -11/+17 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'zj-diverging-commit-count-no-rugged' into 'master' | Robert Speicher | 2017-12-04 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Use commit finder instead of rev parse See merge request gitlab-org/gitlab-ce!15683 | ||||
| * | | | | | Use commit finder instead of rev parse | Zeger-Jan van de Weg | 2017-12-01 | 1 | -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 Maan | 2017-12-04 | 18 | -32/+241 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize API /groups/:id/projects by preloading assocations Closes #40308 See merge request gitlab-org/gitlab-ce!15475 | ||||
| * | | | | | | Fixed bugsh-optimize-groups-api | Francisco Lopez | 2017-12-04 | 2 | -2/+17 |
| | | | | | | | |||||
| * | | | | | | Moving query to base count service | Francisco Lopez | 2017-12-04 | 3 | -8/+4 |
| | | | | | | | |||||
| * | | | | | | Not forcing to redefine preload_relation | Francisco Lopez | 2017-12-01 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Using map to retrieve the element ids because of some issues with mysql | Francisco Lopez | 2017-12-01 | 3 | -4/+9 |
| | | | | | | | |||||
| * | | | | | | Fixed test | Francisco Lopez | 2017-12-01 | 1 | -2/+1 |
| | | | | | | | |||||
| * | | | | | | Undoing the change to ForkNetworkMember | Francisco Lopez | 2017-12-01 | 2 | -12/+11 |
| | | | | | | | |||||
| * | | | | | | Fixed BasicProjectDetail parent | Francisco Lopez | 2017-12-01 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Removed binding.pry | Francisco Lopez | 2017-12-01 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | Removing blank line | Francisco Lopez | 2017-12-01 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | Changes after rebase | Francisco Lopez | 2017-12-01 | 1 | -3/+14 |
| | | | | | | | |||||
| * | | | | | | Undoing debugging change | Francisco Lopez | 2017-12-01 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Comments from code review applied. Also switched forked_from_project and ↵ | Francisco Lopez | 2017-12-01 | 12 | -73/+96 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ForkedProjectLinks to ForkNetworkMember | ||||
| * | | | | | | Refactored /projects and /user/:user_id/projects endpoints | Francisco Lopez | 2017-12-01 | 4 | -25/+77 |
| | | | | | | | |||||
| * | | | | | | Code review comments applied | Francisco Lopez | 2017-12-01 | 3 | -4/+12 |
| | | | | | | | |||||
| * | | | | | | Small renaming | Francisco Lopez | 2017-12-01 | 1 | -4/+4 |
| | | | | | | | |||||
| * | | | | | | More preloading improvement and added batch count services | Francisco Lopez | 2017-12-01 | 6 | -7/+88 |
| | | | | | | | |||||
| * | | | | | | Fix CHANGELOG entry to mention all associations, not just fork networks | Stan Hu | 2017-12-01 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Preload project route to avoid N+1 query | Stan Hu | 2017-12-01 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Only serialize namespace essentials in group's projects API response | Stan Hu | 2017-12-01 | 1 | -2/+4 |
| | | | | | | | |||||
| * | | | | | | Omit the `all` call after Project#project_group_links to avoid unnecessary loads | Stan Hu | 2017-12-01 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Optimize API /groups/:id/projects by preloading associations | Stan Hu | 2017-12-01 | 3 | -0/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #40308 | ||||
* | | | | | | | Merge branch '40691-upgrade-rails-to-4-2-10' into 'master' | Douwe Maan | 2017-12-04 | 3 | -41/+42 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Upgrade Rails to 4.2.10" Closes #40691 See merge request gitlab-org/gitlab-ce!15662 |