summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Avoid committer = linesgit-operation-userJacob Vosmaer2017-08-242-21/+11
|
* Add tests for Committer#==Jacob Vosmaer2017-08-231-0/+22
|
* Fix Hook.new call sites in testsJacob Vosmaer2017-08-232-2/+2
|
* Rubocop whitespaceJacob Vosmaer2017-08-232-9/+8
|
* Move GitHooksService testsJacob Vosmaer2017-08-231-10/+8
|
* Move GitHooksService to Gitlab::GitJacob Vosmaer2017-08-2319-60/+65
|
* Make gl_repository a G::G::Repository attributeJacob Vosmaer2017-08-2318-48/+53
|
* Decouple GitOperationService from UserJacob Vosmaer2017-08-235-26/+60
|
* Merge branch 'disable-webpack-optimization' into 'master'Tim Zallmann2017-08-231-0/+1
|\ | | | | | | | | Disable webpack.optimize because it's breaking karma in EE See merge request !13720
| * disable webpack.optimize.ModuleConcatenationPlugin during karma testsdisable-webpack-optimizationMike Greiling2017-08-211-0/+1
| |
* | Merge branch '33503-new-icons-for-system-notes' into 'master'Clement Ho2017-08-2316-18/+29
|\ \ | | | | | | | | | | | | | | | | | | Implement new system note icons Closes #33503 See merge request !13673
| * | Implement new system note iconsBryce Johnson2017-08-2316-18/+29
|/ /
* | Merge branch 'fix-group-policy-specs-on-mysql' into 'master'Robert Speicher2017-08-221-0/+6
|\ \ | | | | | | | | | | | | | | | | | | Fixes group policy specs on MySQL. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/36810 See merge request !13747
| * | Fixes group policy specs on MySQL.fix-group-policy-specs-on-mysqlTiago Botelho2017-08-221-0/+6
| | |
* | | Merge branch 'rs-fix-master' into 'master'Stan Hu2017-08-222-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add `:nested_groups` metadata to two subgroup-related specs Closes #36811 and #36812 See merge request !13746
| * | | Add `:nested_groups` metadata to two subgroup-related specsRobert Speicher2017-08-222-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Prevents these from failing on MySQL. Closes #36811 and #36812.
* | | | Merge branch '36779-update-kubernetes-install-docs' into 'master'Marcia Ramos2017-08-224-3/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Kubernetes install docs Closes #36779 See merge request !13730
| * | | | Apply feedbackJoshua Lambert2017-08-221-1/+1
| | | | |
| * | | | Fix spacing with code block36779-update-kubernetes-install-docsJoshua Lambert2017-08-223-0/+5
| | | | |
| * | | | Add link to cloud native charts, add helm init infoJoshua Lambert2017-08-224-3/+23
| | | | |
* | | | | Merge branch '36496-badges-should-not-be-huge' into 'master'Clement Ho2017-08-221-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Badges should not be HUGE" Closes #36496 See merge request !13635
| * | | | | Sometimes you don't see the forrest because of all the trees, set now the ↵36496-badges-should-not-be-hugeTim Zallmann2017-08-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | preloading sizes to specific lazy class
* | | | | | Merge branch 'update-monaco-loader-test' into 'master'Jacob Schatz2017-08-224-13/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix monaco loader test See merge request !13682
| * | | | | | add global __webpack_public_path__ to eslint configupdate-monaco-loader-testMike Greiling2017-08-184-7/+4
| | | | | | |
| * | | | | | fix monaco loader test to not break with statically analyzed import statementsMike Greiling2017-08-181-7/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'docs-merge-request-diff-nav' into 'master'Marcia Ramos2017-08-222-0/+8
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Docs merge request diff nav See merge request !13743
| * | | | | img/merge_request_diff_file_navigation.pngVictor Wu2017-08-221-0/+0
| | | | | |
| * | | | | Merge request diff file navigationVictor Wu2017-08-221-0/+8
| | |_|_|/ | |/| | |
* | | | | Merge branch 'git-gc-raise-lease-timeotu' into 'master'Sean McGivern2017-08-222-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Raise Git GC (Housekeeping) Lease Timeout to 24h See merge request !13719
| * | | | | Raise GC Lease Timeout to 24hgit-gc-raise-lease-timeotuKim "BKC" Carlbäcker2017-08-222-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'fix/sm/34762-bad-validation-message' into 'master'Kamil Trzciński2017-08-223-2/+10
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enforce namespace of Kubernetes to lowercase Closes #34762 See merge request !13732
| * | | | | Update kubernetes_service_spec.rbfix/sm/34762-bad-validation-messageShinya Maeda2017-08-221-1/+1
| | | | | |
| * | | | | Enfouce namespace for Kubernetes to lowercaseShinya Maeda2017-08-223-2/+10
| | |_|_|/ | |/| | |
* | | | | Merge branch '36721-rename-repo-text' into 'master'Annabel Dunstone Gray2017-08-221-2/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36721 Remove incorrect paragraph regarding renaming repos in settings Closes #36721 See merge request !13718
| * | | | | 36721 Remove incorrect paragraph regarding renaming repos in settings36721-rename-repo-texttauriedavis2017-08-211-2/+0
| | | | | |
* | | | | | Merge branch 'zj-fix-import-gitlab-export-form' into 'master'Douwe Maan2017-08-223-40/+49
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update form to properly set the path Closes #36519 See merge request !13722
| * | | | | | Update form to properly set the pathZeger-Jan van de Weg2017-08-223-40/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also includes a change in allowing uploaded files, as there was a mismatch in object_id between classes, disallowing params[:file], which is a UploadedFile, newly loaded. The params checked against the older version. Fixes gitlab-org/gitlab-ce#36519
* | | | | | | Merge branch 'fix/import-fork-mr' into 'master'Sean McGivern2017-08-226-2/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Import/Export issue to do with fork merge requests Closes #36666 See merge request !13717
| * | | | | | | fix static analysisfix/import-fork-mrJames Lopez2017-08-221-2/+0
| | | | | | | |
| * | | | | | | fix specsJames Lopez2017-08-221-1/+6
| | | | | | | |
| * | | | | | | add changelogJames Lopez2017-08-211-0/+5
| | | | | | | |
| * | | | | | | Fix fork MRs importing issueJames Lopez2017-08-215-2/+21
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'fix-broadcast-message-caching' into 'master'Sean McGivern2017-08-223-5/+55
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix caching of future broadcast messages Closes #36661 See merge request !13667
| * | | | | | | Fix caching of future broadcast messagesfix-broadcast-message-cachingYorick Peterse2017-08-213-5/+55
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the caching mechanism so we cache both current _and_ future broadcast messages, then manually filter out those we don't want to display. This ensures we don't need any additional queries while still being able to display the right messages at the right time. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36661
* | | | | | | Update VERSION to 9.6.0-prev9.6.0.preSimon Knox2017-08-221-1/+1
| | | | | | |
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceSimon Knox2017-08-224-33/+94
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '34533-inline-single-authorized-projects' into 'master'Douwe Maan2017-08-224-33/+94
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use an event-based system when waiting for AuthorizedProjectsWorker to complete See merge request !13564
| | * | | | | | | Use event-based waiting in Gitlab::JobWaiterNick Thomas2017-08-224-33/+94
| | | | | | | | |
* | | | | | | | | Update CHANGELOG.md for 9.5.0Simon Knox2017-08-22148-604/+166
|/ / / / / / / / | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch '35845-improve-subgroup-creation-permissions' into 'master'Douwe Maan2017-08-228-12/+74
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves subgroup creation permissions Closes #35845 See merge request !13418