summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add custom range time windows to the performance dashboardjivl-add-custom-range-time-windows-dropdownJose Vargas2019-03-132-12/+65
| | | | | This is adds the possibility to do custom time ranges inside the time window dropdown
* Add support for time windows for the performance dashbooardsJose Vargas2019-03-134-28/+96
| | | | | | The performance dashboards will now display the data from a set amount of time windows that are defined on a constants file
* Merge branch 'remove-some-easy-factories-from-migration-specs' into 'master'Rémy Coutable2019-03-125-31/+62
|\ | | | | | | | | Remove some easy factories from migration specs See merge request gitlab-org/gitlab-ce!26025
| * Remove factories from IssuesMovedToIdForeignKey specSean McGivern2019-03-121-8/+7
| |
| * Remove factories from projects cleanup specSean McGivern2019-03-121-11/+8
| |
| * Remove factories from CalculateConvDevIndexPercentages specSean McGivern2019-03-121-2/+20
| |
| * Remove factories from AddForeignKeysToTodos specSean McGivern2019-03-121-1/+1
| |
| * Remove factories from MovePersonalSnippetsFiles specSean McGivern2019-03-121-9/+26
| |
* | Merge branch 'issue#50386' into 'master'Rémy Coutable2019-03-123-9/+5
|\ \ | | | | | | | | | | | | | | | | | | Remove fake repository_path response - resolved issue# 50386 Closes #50386 See merge request gitlab-org/gitlab-ce!25942
| * | Remove fake repository_path responseFabio Papa2019-03-123-9/+5
|/ / | | | | | | | | | | The repository_path is no longer needed since https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/231, which closes https://gitlab.com/gitlab-org/gitlab-shell/issues/135.
* | Merge branch 'bvl-internal-auth-using-header' into 'master'Nick Thomas2019-03-122-4/+22
|\ \ | | | | | | | | | | | | Authenticate the internal API using a header See merge request gitlab-org/gitlab-ce!25924
| * | Authenticate the internal API using a headerBob Van Landuyt2019-03-112-4/+22
| | | | | | | | | | | | | | | Instead of mixing in the shared secret into the querystring or body, we could also specify it in a header.
* | | Merge branch 'patch-48' into 'master'Annabel Dunstone Gray2019-03-121-25/+3
|\ \ \ | | | | | | | | | | | | | | | | Update feature proposal template with "Intended users" See merge request gitlab-org/gitlab-ce!25906
| * | | Update feature proposal template with "Intended users"Sarah Voegeli2019-03-121-25/+3
|/ / /
* | | Merge branch 'revert-bc1b6253' into 'master'Stan Hu2019-03-122-6/+1
|\ \ \ | | | | | | | | | | | | | | | | Revert "Merge branch 'gitaly-version-v1.28.0' into 'master'" See merge request gitlab-org/gitlab-ce!26037
| * | | Revert "Merge branch 'gitaly-version-v1.28.0' into 'master'"Zeger-Jan van de Weg2019-03-122-6/+1
| | | | | | | | | | | | This reverts merge request !26026
* | | | Merge branch 'update-rack-oauth2' into 'master'Rémy Coutable2019-03-123-9/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update rack-oauth2 1.2.1 -> 1.9.3 Closes #21732 See merge request gitlab-org/gitlab-ce!17868
| * | | | Update rack-oauth2 1.2.1 -> 1.9.3Pirate Praveen2019-03-123-9/+14
| | | | |
* | | | | Merge branch 'fix-new-merge-request-diff-headers-sticky-position' into 'master'Filipa Lacerda2019-03-122-0/+15
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fixed sticky headers in merge request creation diff Closes #57691 See merge request gitlab-org/gitlab-ce!26027
| * | | | Fixed sticky headers in merge request creation diffPhil Hughes2019-03-122-0/+15
| | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57691
* | | | | Merge branch ↵Nick Thomas2019-03-122-1/+6
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '58797-broken-ui-on-a-closed-merge-request-from-a-deleted-source-project' into 'master' Fix UI for closed MR when source project is removed Closes #58797 See merge request gitlab-org/gitlab-ce!25967
| * | | | Fix UI for closed MR when source project is removedTakuya Noguchi2019-03-112-1/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | Merge branch 'tag-pipeline-asset-image' into 'master'Rémy Coutable2019-03-122-1/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Tag asset docker image with GitLab version also See merge request gitlab-org/gitlab-ce!26029
| * | | | | Tag asset docker image with GitLab version alsoBalasankar "Balu" C2019-03-122-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
* | | | | | Merge branch 'qa-quarantine-add-member-test' into 'master'Sanad Liaquat2019-03-121-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quarantine failing test See merge request gitlab-org/gitlab-ce!26028
| * | | | | | Quarantine failing testMark Lapierre2019-03-121-1/+2
| |/ / / / /
* | | | | | Merge branch 'gitaly-version-v1.28.0' into 'master'Douwe Maan2019-03-122-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Gitaly to v1.28.0 See merge request gitlab-org/gitlab-ce!26026
| * | | | | | Upgrade Gitaly to v1.28.0GitalyBot2019-03-122-1/+6
|/ / / / / /
* | | | | | Merge branch '58789-some-system-notes-on-issuable-are-folded-on-mobile' into ↵Annabel Dunstone Gray2019-03-124-37/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Keep inline as much as possible in system notes on issuable Closes #58789 See merge request gitlab-org/gitlab-ce!25968
| * | | | | | Keep inline as much as possible in system notes on issuableTakuya Noguchi2019-03-124-37/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | Merge branch '58781-silent-progress-in-auto-devops' into 'master'Kamil Trzciński2019-03-122-4/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use curl silent/show-error options on Auto DevOps' deploy Closes #58781 See merge request gitlab-org/gitlab-ce!25954
| * | | | | | | Use curl silent/show-error options on Auto DevOpsTakuya Noguchi2019-03-112-4/+9
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | Merge branch 'ce-9826-fix-broken-downstreams' into 'master'Kamil Trzciński2019-03-122-3/+17
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | CE port for expanded pipelines See merge request gitlab-org/gitlab-ce!25859
| * | | | | | CE port for expanded pipelinesFilipa Lacerda2019-03-072-3/+17
| | | | | | |
* | | | | | | Merge branch 'fix-ide-web-worker-relative-url' into 'master'Filipa Lacerda2019-03-122-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed Web IDE web workers not loading with relative root URL Closes #50451 See merge request gitlab-org/gitlab-ce!26015
| * | | | | | | Fixed Web IDE web workers not loading with relative root URLPhil Hughes2019-03-122-1/+6
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50451
* | | | | | | Merge branch 'revert-b923d1b5' into 'master'Sean McGivern2019-03-121-19/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'check_pg_stat_activity' into 'master'" See merge request gitlab-org/gitlab-ce!26016
| * | | | | | | Revert "Merge branch 'check_pg_stat_activity' into 'master'"Thong Kuah2019-03-121-19/+0
| | |_|_|_|_|/ | |/| | | | | | | | | | | | This reverts merge request !25723
* | | | | | | Merge branch '52447-auto-devops-at-group-level' into 'master'Kamil Trzciński2019-03-1225-38/+789
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable/disable Auto DevOps at the Group level Closes #52447 See merge request gitlab-org/gitlab-ce!25533
| * | | | | | | Enable/disable Auto DevOps at Group levelMayra Cabrera2019-03-1225-38/+789
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Includes instance methods on Group model to detect when a group has AutoDevOps explicitly/implicitly enabled/disabled. - Includes migration to add a new column to namespaces table - Add UI necessary modifications - Add service and controller to update auto devops related instances - Updates project and groups auto devops badges Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52447
* | | | | | | Merge branch 'renovate/gitlab-ui-2.x' into 'master'Phil Hughes2019-03-122-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/ui to ^2.2.3 See merge request gitlab-org/gitlab-ce!25977
| * | | | | | | Update dependency @gitlab/ui to ^2.2.3Lukas 'Eipi' Eipert2019-03-112-5/+5
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'sh-store-rspec-profiling-csv' into 'master'Rémy Coutable2019-03-123-16/+87
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Batch insert CI profiling spec data Closes gitlab-ee#10154 See merge request gitlab-org/gitlab-ce!25937
| * | | | | | Batch insert CI rspec_profiling dataStan Hu2019-03-123-16/+87
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of inserting a row after each example to an external database, we save the CI profiling reports into the `rspec_profiling` directory and insert the data in the update-tests-metadata CI stage. This should make each spec run faster and also reduce the number of PostgreSQL connections needed by concurrent CI builds. `scripts/insert-rspec-profiling-data` also inserts one file at a time via the PostgreSQL COPY command for faster inserts. The one side effect is that the `created_at` and `updated_at` timestamps aren't available since they aren't generated in the CSV. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/10154
* | | | | | Merge branch 'fix-emojis-fixture-creating-ee-specific-file' into 'master'Lin Jen-Shin2019-03-121-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't create EE-specific files when creating Emojis fixture files See merge request gitlab-org/gitlab-ce!26011
| * | | | | | Don't create EE-specific files when creating Emojis fixture filesRémy Coutable2019-03-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'label-issues-and-merge-requests-in-seeds' into 'master'Lin Jen-Shin2019-03-126-106/+60
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Add a new dedicated labels seeder script and automatically add labels to seeded issues and merge requests See merge request gitlab-org/gitlab-ce!25974
| * | | | | | Add labels to seeded issues and merge requestsRémy Coutable2019-03-126-106/+60
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch '10080-env-contaier' into 'master'Phil Hughes2019-03-122-5/+44
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes ee differences for container.vue Closes gitlab-ee#10080 See merge request gitlab-org/gitlab-ce!25957
| * | | | | | Removes ee differences for container.vueFilipa Lacerda2019-03-112-5/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates a mixin to include the ee only properties