summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Unify lib/api/merge_requests.rb with EEprepend-grape-api-ceLin Jen-Shin2018-03-061-21/+40
|
* Merge branch 'jprovazn-count-cleanup' into 'master'43739-gl_repository-not-set-when-merging-merge-requests-from-the-web-uiRobert Speicher2018-03-059-7/+18
|\ | | | | | | | | | | | | Cleanup after adding MR diff's commit_count Closes #41698 See merge request gitlab-org/gitlab-ce!17513
| * Cleanup after adding MR diff's commit_countJan Provaznik2018-03-059-7/+18
| | | | | | | | | | | | * processes any pending records which are not migrated yet * bumps import_export version because of new commits_count attribute * removes commits_count fallback method
* | Merge branch 'fix-impersonate-ui' into 'master'Rémy Coutable2018-03-051-1/+0
|\ \ | | | | | | | | | | | | Remove impersonate token from flash scope in UI See merge request gitlab-org/gitlab-ce!17480
| * | Remove impersonate token from flash scopejulien MILLAU2018-03-021-1/+0
| | |
* | | Merge branch 'fix/find-commit-with-empty-rev' into 'master'Robert Speicher2018-03-051-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Keep note commit around if commit_id is present Closes gitaly#1054 See merge request gitlab-org/gitlab-ce!17496
| * | | Keep a commit around if its sha is presentAhmad Sherif2018-03-051-1/+1
| | | | | | | | | | | | | | | | Closes gitaly#1054
* | | | Merge branch 'kp-label-select-vue' into 'master'Phil Hughes2018-03-0532-10/+1231
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Port Labels Select dropdown to Vue See merge request gitlab-org/gitlab-ce!17411
| * | | | Add changelog entrykp-label-select-vueKushal Pandya2018-03-051-0/+5
| | | | |
| * | | | LabelsSelect DropdownValueCollapsed ComponentKushal Pandya2018-03-052-0/+122
| | | | |
| * | | | LabelsSelect DropdownValue ComponentKushal Pandya2018-03-052-0/+157
| | | | |
| * | | | LabelsSelect DropdownTitle ComponentKushal Pandya2018-03-052-0/+72
| | | | |
| * | | | LabelsSelect DropdownSearchInput ComponentKushal Pandya2018-03-052-0/+66
| | | | |
| * | | | LabelsSelect DropdownHiddenInput ComponentKushal Pandya2018-03-052-0/+59
| | | | |
| * | | | LabelsSelect DropdownHeader ComponentKushal Pandya2018-03-052-0/+57
| | | | |
| * | | | LabelsSelect DropdownFooter ComponentKushal Pandya2018-03-052-0/+76
| | | | |
| * | | | LabelsSelect DropdownCreateLabel ComponentKushal Pandya2018-03-052-0/+168
| | | | |
| * | | | LabelsSelect DropdownButton ComponentKushal Pandya2018-03-052-0/+160
| | | | |
| * | | | LabelsSelect Base ComponentKushal Pandya2018-03-052-0/+230
| | | | |
| * | | | LabelsSelectComponent tests mock dataKushal Pandya2018-03-051-0/+49
| | | | |
| * | | | Update path for ListLabel modelKushal Pandya2018-03-057-7/+7
| | | | |
| * | | | ListLabel Shared ModelKushal Pandya2018-03-051-3/+1
| | | | |
| * | | | Add `suggest_colors` from LabelsHelperKushal Pandya2018-03-051-0/+1
| | | | |
| * | | | Allow exposing methods to `gon_helper`Kushal Pandya2018-03-051-0/+1
| | |_|/ | |/| |
* | | | Merge branch '42572-release-controller' into 'master'Robert Speicher2018-03-057-82/+145
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Try not to hold env and release the controller after the request. See merge request gitlab-org/gitlab-ce!16847
| * | | | Move constants and update for feedback42572-release-controllerLin Jen-Shin2018-03-034-18/+15
| | | | |
| * | | | Merge remote-tracking branch 'upstream/master' into 42572-release-controllerLin Jen-Shin2018-03-032182-37491/+58730
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (889 commits) SlackService - respect `notify_only_default_branch` for push events Clarify usage ping wording in admin area Update incoming emails documents Allow to include also descendant group labels Update docs on grouping CI jobs Support additional LabelsFinder parameters for group labels Extend Cluster Applications to install GitLab Runner to Kubernetes cluster Remove registry list webpack entry point Remove trailing newline that was causing an EE conflict Small fixes in Vuex docs Remove u2f webpack bundle Update documentation WRT to request parameters remove common_vue CommonsChunk config Fetch commit signatures from Gitaly in batches migrate stl_viewer to dynamic import migrate sketch_viewer to dynamic import migrate pdf_viewer to dynamic import migrate notebook_viewer to dynamic import migrate balsamiq_viewer to dynamic import Add some strings that were missing in gitlab.pot ...
| * | | | | Update peek-performance_bar which doesn't hold envLin Jen-Shin2018-02-071-1/+1
| | | | | |
| * | | | | Put controller in its separate fileLin Jen-Shin2018-02-072-79/+84
| | | | | |
| * | | | | Release the entire envLin Jen-Shin2018-02-074-11/+16
| | | | | |
| * | | | | Use a controller to hold request valuesLin Jen-Shin2018-02-072-61/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that we don't need to hold env after the request. This makes it much harder to test, especially Rails session is acting weirdly, so we need `dig('flash', 'flashes', 'alert')` to dig the actual flash value.
| * | | | | Try not to hold env and release the controllerLin Jen-Shin2018-02-074-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after the request. This way, we could release the project referred from the controller, which potentially referred a repository which potentially allocated a lot of memories. Before this change, we could hold the last request data and cannot release the memory. After this change, the largest request data should be able to be collected from GC. This might not impact the instances having heavy load, as the last request should be changing all the time, and GC won't kick in for each request anyway. However it could still potentially allow us to free more memories for each GC runs, because now we could free one more request anyway.
* | | | | | Merge branch ↵Robert Speicher2018-03-052-34/+47
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43809-not-seeing-mentioned-in-commit-system-message-after-merging' into 'master' Resolve "Not seeing "mentioned in commit" system message after merging" Closes #43809 See merge request gitlab-org/gitlab-ce!17524
| * | | | | | Fix MR merge commit cross-references to the MR itselfSean McGivern2018-03-052-34/+47
| | | | | | |
* | | | | | | Merge branch 'gitaly-lfs-changes' into 'master'Douwe Maan2018-03-056-45/+170
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorporate Gitaly's RPCs for Gitlab::Git::LfsChanges Closes gitaly#1048 See merge request gitlab-org/gitlab-ce!16973
| * | | | | | | Incorporate Gitaly's RPCs for Gitlab::Git::LfsChangesgitaly-lfs-changesAlejandro Rodríguez2018-03-026-45/+170
| | | | | | | |
* | | | | | | | Merge branch 'feature/add-support-for-all-option-in-count-find-commits' into ↵Douwe Maan2018-03-056-185/+193
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add support for :all option to {count,find}_commits See merge request gitlab-org/gitlab-ce!17464
| * | | | | | | | Add support for :all option to {count,find}_commitsfeature/add-support-for-all-option-in-count-find-commitsAhmad Sherif2018-03-026-185/+193
| | | | | | | | |
* | | | | | | | | Merge branch '41719-mr-title-fix' into 'master'Douwe Maan2018-03-056-91/+175
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render htmlentities correctly for links not supported by Rinku Closes #41719 See merge request gitlab-org/gitlab-ce!17180
| * | | | | | | | | Match Rinku's behaviour for closing punctuation in links41719-mr-title-fixSean McGivern2018-03-022-31/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rinku 2.0.0 (the version we use) will remove the last character of a link if it's a closing part of a punctuation pair (different types of parentheses and quotes), unless both of the below are true: 1. The matching pair has different start and end characters. 2. There are equal numbers of both in the matched string (they don't have to be balanced).
| * | | | | | | | | Render htmlentities correctly for links not supported by RinkuJarka Kadlecová2018-02-216-66/+89
| | | | | | | | | |
* | | | | | | | | | Merge branch 'wip-slash-command-on-mr-description' into 'master'Rémy Coutable2018-03-057-15/+64
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New `/wip` quick action on MR creation Closes #26848 See merge request gitlab-org/gitlab-ce!17463
| * | | | | | | | | | Add "added" type on changelogOswaldo Ferreira2018-03-051-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Update changelogOswaldo Ferreira2018-03-051-3/+2
| | | | | | | | | | |
| * | | | | | | | | | Rename quick actions handlerOswaldo Ferreira2018-03-052-3/+3
| | | | | | | | | | |
| * | | | | | | | | | Move wip handling to MergeRequest::BaseServicewip-slash-command-on-mr-descriptionOswaldo Ferreira2018-03-016-1044/+25
| | | | | | | | | | |
| * | | | | | | | | | /wip slash command on MR creationAdam Pahlevi2018-03-016-11/+1079
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change to symbol add complete changelog add test for /wip unwip as sym test for work in progress separate from issuable
* | | | | | | | | | | Merge branch ↵Rémy Coutable2018-03-053-9/+40
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37430-projects-comparecontroller-show-is-calling-gitaly-n-1-times-per-request' into 'master' Resolve "Projects::CompareController#show is calling Gitaly n+1 times per request" Closes #37430 See merge request gitlab-org/gitlab-ce!17439
| * | | | | | | | | | | Fix n+1 issue by not reloading fully loaded blobsAlejandro Rodríguez2018-03-053-9/+40
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'feature/#43691-count-diff-note-calendar-activity' into 'master'Sean McGivern2018-03-053-5/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #43691: DiffNotes not counted by ContributionsCalendar Closes #43691 See merge request gitlab-org/gitlab-ce!17418
View Lorry Controller Status