summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 9.4.0-rc5v9.4.0-rc5James Edwards-Jones2017-07-201-1/+1
|
* Merge branch 'fix-re2-infinite-loop-nick' into 'security-9-3'Sean McGivern2017-07-203-8/+45
| | | | | Fix an infinite loop in Gitlab:UntrustedRegexp See merge request !2146
* Update VERSION to 9.4.0-rc4v9.4.0-rc4James Edwards-Jones2017-07-191-1/+1
|
* Merge branch '24570-use-re2-for-user-supplied-regexp-9-3' into 'security-9-3'Douwe Maan2017-07-199-4/+174
| | | | | | 24570 use re2 for user supplied regexp 9 3 See merge request !2129
* Merge branch '33303-404-for-unauthorized-project' into 'security-9-3'Sean McGivern2017-07-193-0/+44
| | | | | [9.3 security fix] Renders 404 if given project is not readable by the user on Todos dashboard See merge request !2118
* Merge branch '33359-pers-snippet-files-location' into 'security-9-3'Sean McGivern2017-07-1911-21/+300
| | | | | Use uploads/system directory for personal snippets See merge request !2123
* Merge branch 'bvl-remove-appearance-symlink' into 'security-9-3'Douwe Maan2017-07-194-1/+103
| | | | | | Remove the `appearance` symlink that was previously missed See merge request !2124
* Update VERSION to 9.4.0-rc3v9.4.0-rc3Mike Greiling2017-07-141-1/+1
|
* Merge branch '33672_supplement_portuguese_brazil_translation_of_i18n' into ↵9-4-stable-preparing-rc3Douwe Maan2017-07-142-46/+928
| | | | | | | | | 'master' Supplement Portuguese Brazil translation of Project Page & Repository Page Closes #33672 See merge request !12156
* Merge branch ↵Robert Speicher2017-07-143-15/+89
| | | | | | | | | '34780-restricted-visibility-levels-in-admin-application-settings-looks-off' into 'master' Fix wrong helper used for adding context for translations. Closes #34780 See merge request !12731
* Merge branch ↵Rémy Coutable2017-07-141-4/+58
| | | | | | | | | '34792_add_traditional_chinese_in_taiwan_translations_of_pipeline_charts' into 'master' Add Traditional Chinese in Taiwan translations of Pipeline Charts Closes #34792 See merge request !12697
* Merge branch 'gitlab-shell-5-3-1' into 'master'Stan Hu2017-07-141-1/+1
| | | | | | | | Update gitlab-shell to v5.3.1 Closes gitlab-shell#92 See merge request !12817
* Merge branch 'update-gitaly-0-17-0' into 'master'Rémy Coutable2017-07-141-1/+1
| | | | | | | Use Gitaly server v0.17.0 Closes #34853 See merge request !12802
* Merge branch '34835-environment-truncate-job' into 'master'Filipa Lacerda2017-07-141-2/+2
| | | | | | | Truncate job on environment view Closes #34835 See merge request !12818
* Merge branch 'sh-add-simple-mode-mr-api-9-4-stable' into ↵James Edwards-Jones2017-07-149-42/+189
|\ | | | | | | | | | | | | '9-4-stable-preparing-rc3' Cherry pick performance improvements and simple merge request API changes to 9-4-stable See merge request !12799
| * Merge branch 'sh-add-mr-simple-mode' into 'master'sh-add-simple-mode-mr-api-9-4-stableSean McGivern2017-07-115-5/+48
| | | | | | | | | | | | | | Add a simple mode to merge request API Closes #34920 See merge request !12766
| * Merge branch 'sh-improve-mr-api' into 'master'Sean McGivern2017-07-111-4/+4
| | | | | | | | | | Paginate the merge requests API earlier to avoid eager loading every merge request See merge request !12764
| * Merge branch 'sh-optimize-mr-api-emojis-and-labels' into 'master'Sean McGivern2017-07-117-41/+145
| | | | | | | | | | | | | | Remove remaining N+1 queries in merge requests API with emojis and labels Closes #34159 See merge request !12732
* | Merge branch 'backport-mr-create-service-changes' into 'master'Grzegorz Bizon2017-07-141-2/+1
| | | | | | | | | | Backport MR create service changes from EE See merge request !12808
* | Merge branch 'instrument-ability' into 'master'Yorick Peterse2017-07-141-0/+4
| | | | | | | | | | Instrument Ability See merge request !12865
* | Merge branch 'sh-fix-nil-broadcast-message' into 'master'Sean McGivern2017-07-143-2/+13
| | | | | | | | | | | | | | Handle case when BroadcastMessage.current is nil Closes #35094 See merge request !12860
* | Merge branch 'dm-merge-request-creation-error' into 'master'Stan Hu2017-07-142-7/+32
| | | | | | | | | | | | | | Make sure MergeRequest commit methods work when either compare_commits or merge_request_diff is set Closes #35077 See merge request !12856
* | Merge branch 'revert-73579e66' into 'master'Grzegorz Bizon2017-07-145-52/+4
| | | | | | | | | | Revert "Merge branch 'revert-2c879643' into 'master'" See merge request !12870
* | Merge branch '34598-more-metrics-info-should-go-to-gitlab-docs' into 'master'Filipa Lacerda2017-07-141-2/+2
| | | | | | | | | | | | | | Fix links to documentation describing the Prometheus service and its specifics. Closes #34598 See merge request !12714
* | Merge branch '34325-reinstate-is_admin-for-user-api' into 'master'Sean McGivern2017-07-145-6/+53
| | | | | | | | | | | | | | Return `is_admin` attribute in the GET /user endpoint for admins Closes #34325 See merge request !12811
* | Merge branch 'breadcrumbs-limit-width' into 'master'Annabel Dunstone Gray2017-07-144-1/+4
| | | | | | | | | | | | | | Added limit-container-width to breadcrumbs container Closes #34573 See merge request !12776
* | Merge branch 'new-nav-preferences-image' into 'master'Filipa Lacerda2017-07-141-0/+0
| | | | | | | | | | | | | | Updated new navigation image in preferences Closes #34970 See merge request !12806
* | Merge branch 'navigation-toggle' into 'master'Phil Hughes2017-07-142-2/+2
| | | | | | | | | | Fix wording of nav toggle See merge request !12796
* | Merge branch '35036-commit-page-dropdown' into 'master'Phil Hughes2017-07-141-1/+1
| | | | | | | | | | | | | | Fix i18n string in commit page options dropdown Closes #35036 See merge request !12831
* | Merge branch 'reload-new-navigation-option-change' into 'master'Filipa Lacerda2017-07-141-0/+3
| | | | | | | | | | | | | | Reload page after changing navigation preference Closes #34968 See merge request !12833
* | Merge branch '35035-sidebar-job-spaces' into 'master'Phil Hughes2017-07-143-4/+12
| | | | | | | | | | | | | | Fix spacing in sidebar Closes #35035 See merge request !12844
* | Update VERSION to 9.4.0-rc2v9.4.0-rc2James Edwards-Jones2017-07-121-1/+1
| |
* | Update VERSION to 9.4.0-rc1v9.4.0-rc1Mike Greiling2017-07-111-1/+1
| |
* | Merge branch '9-4-stable-prepare-RC1' into '9-4-stable'Mike Greiling2017-07-1154-666/+935
|\ \ | |/ |/| | | | | Preparing 9.4 RC1 CE-stable See merge request !12790
| * Merge branch '33949-remove-healthcheck-access-token' into 'master'9-4-stable-prepare-RC1Sean McGivern2017-07-1113-90/+228
| | | | | | | | | | | | | | Remove the need to use health check token by adding ability to whitelist hosts Closes #33949 See merge request !12612
| * Merge branch '34907-dont-show-pipeline-schedule-button-for-non-member' into ↵Kamil Trzciński2017-07-113-130/+169
| | | | | | | | | | | | | | | | | | 'master' Do not show pipeline schedule button for non-member Closes #34907 See merge request !12757
| * Merge branch 'jej/9-4-update-license-list' into 'master'Rémy Coutable2017-07-111-260/+300
| | | | | | | | | | Updated vendor/licenses.csv for 9.4 See merge request !12788
| * Merge branch 'fix/gb/qa/configure-headless-chrome-screenshots' into 'master'Rémy Coutable2017-07-111-0/+4
| | | | | | | | | | Configure headless chrome screenshots correctly See merge request !12746
| * Merge branch 'fix_milestone_destroy_service' into 'master'Mike Greiling2017-07-112-2/+55
| | | | | | | | | | Fix milestones destroy service See merge request !12762
| * Merge branch 'revert_bootsnap' into 'master'Robert Speicher2017-07-114-15/+0
| | | | | | | | | | Revert "Merge branch 'update_bootsnap_1.1.1' into 'master'" See merge request !12755
| * Merge branch 'catch-redis-address-error' into 'master'Stan Hu2017-07-112-2/+2
| | | | | | | | | | | | | | Catch redis address error Closes omnibus-gitlab#2545 See merge request !12542
| * Merge branch 'sidebar-badge-fix-firefox' into 'master'Filipa Lacerda2017-07-111-2/+2
| | | | | | | | | | Fixed badge alignment in new project sidebar in FireFox See merge request !12777
| * Merge branch 'document-gitlab-shell-disable-gems' into 'master'Stan Hu2017-07-111-0/+6
| | | | | | | | | | doc:installation add note about disable-gems for gitlab-shell See merge request !12765
| * Merge branch 'sh-fix-award-emoji-spec' into 'master'Rémy Coutable2017-07-111-2/+2
| | | | | | | | | | | | | | Fix spec/helpers/award_emoji_helper_spec.rb by using `iid` instead of `id` Closes gitlab-ee#2890 See merge request !12770
| * Merge branch 'sh-disabled-prepared-statements-in-test' into 'master'Yorick Peterse2017-07-112-0/+2
| | | | | | | | | | Disabled prepared statements in test See merge request !12773
| * Merge branch '34933-fix-welcome-page-actions-alignment' into 'master'Phil Hughes2017-07-115-92/+40
| | | | | | | | | | | | | | Fix welcome page action items alignment Closes #34933 See merge request !12778
| * Merge branch 'fix-n-plus-one-in-url-builder' into 'master'Rémy Coutable2017-07-112-5/+7
| | | | | | | | | | | | | | Don't reload ActiveRecord objects when building note URLs Closes #34882 See merge request !12780
| * Merge branch 'fix/gb/qa/fix-test-scenario-for-adding-a-project' into 'master'Rémy Coutable2017-07-114-19/+8
| | | | | | | | | | | | | | Fix QA test scenario for creating a new project Closes gitlab-qa#56 See merge request !12747
| * Merge branch 'backport-exceptions-argument' into 'master'Rémy Coutable2017-07-111-2/+4
| | | | | | | | | | Allow passing exceptions when creating project services See merge request !12745
| * Merge branch 'fix/offline_runner_detection' into 'master'Rémy Coutable2017-07-112-3/+11
| | | | | | | | | | Fix offline runner detection See merge request !11751
View Lorry Controller Status