summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix-old-mr-diffs' into 'master'9-5-stable-patch-2Douwe Maan2017-08-253-5/+70
| | | | | | | Fix old MR diffs Closes #36516 See merge request !13744
* Merge branch 'fix-push-events-branch-removals' into 'master'Sean McGivern2017-08-257-11/+62
| | | | | | | Fix displaying events of removed events and events without commit messages Closes #36685 and #36722 See merge request !13721
* Merge branch 'remove-tooltip-filtered-search-user' into 'master'Tim Zallmann2017-08-253-9/+46
| | | | | | | Remove tooltip from filtered search user Closes #36696 See merge request !13752
* Merge branch 'zj-fix-fe-blank-button' into 'master'Clement Ho2017-08-252-1/+6
| | | | | | | Fix blank button not resetting project template value Closes #36816 See merge request !13757
* Merge branch 'fix/gitlay-raw-blame-request-encoding' into 'master'Robert Speicher2017-08-251-2/+2
| | | | | Properly encode Gitaly RawBlame request params See merge request !13764
* Merge branch 'dm-ldap-adapter-attributes' into 'master'Robert Speicher2017-08-254-8/+19
| | | | | | | Support simple string LDAP attribute specifications, and search for name rather… Closes #36841 See merge request !13776
* Merge branch '36709-gpg-status' into 'master'Clement Ho2017-08-253-6/+7
| | | | | | | Fix alignment of gpg status Closes #36709 See merge request !13772
* Merge branch '36589-hide-group-name-on-collapse' into 'master'Clement Ho2017-08-255-7/+6
| | | | | | | Hide group title on sidebar collapse; use more generic class for titles Closes #36589 See merge request !13777
* Merge branch 'rs-stub-storage-availability-check' into 'master'Douwe Maan2017-08-242-4/+10
| | | | | | Stub `ForkedStorageCheck.storage_available?` by default in all specs See merge request !13726
* Merge branch 'fix-broken-testing-of-some-integrations' into 'master'Douwe Maan2017-08-243-16/+40
| | | | | | | Fix inability to test some project integrations Closes gitlab-ee#3194 See merge request !13729
* Merge branch '36496-badges-should-not-be-huge' into 'master'Clement Ho2017-08-241-0/+3
| | | | | | | Resolve "Badges should not be HUGE" Closes #36496 See merge request !13635
* Update VERSION to 9.5.1v9.5.1Simon Knox2017-08-231-1/+1
|
* Update CHANGELOG.md for 9.5.1Simon Knox2017-08-236-23/+8
| | | [ci skip]
* Include missing Gitlab::GitalyClient.encode method in 9-5-stable9-5-stable-patch-1Alejandro Rodríguez2017-08-221-0/+4
|
* Merge branch 'fix/gb/fix-head-pipeline-when-pipeline-has-errors' into 'master'Kamil Trzciński2017-08-223-15/+59
| | | | | | | | | | Fix merge request head pipeline when pipeline has errors Closes #36657 See merge request !13664 # Conflicts: # spec/services/ci/create_pipeline_service_spec.rb
* 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
* 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
* 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
* 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
* Merge branch 'bvl-circuitbreaker-settings-to-avoid-failures' into 'master'Rémy Coutable2017-08-224-13/+58
| | | | | | | Circuitbreaker settings to avoid spec-failures Closes #36324 See merge request !13519
* Merge branch 'gitaly-tree-entries-encoding' into 'master'Robert Speicher2017-08-222-2/+16
| | | | | | | Correctly encode string params for Gitaly's TreeEntries RPC Closes #36720 See merge request !13724
* Merge branch 'rs-git-access-spec-speed' into 'master'Douwe Maan2017-08-222-142/+126
| | | | | Greatly reduce test duration for git_access_spec See merge request !13675
* Merge branch ↵Marcia Ramos2017-08-2210-8/+60
| | | | | | | | | '36533-add-docs-for-group-issues-page-and-group-merge-requests-page' into 'master' Add docs for group issues page and group merge requests page Closes #36533 See merge request !13678
* Merge branch 'only-limit-fetch-when-requested' into 'master'Robert Speicher2017-08-225-19/+44
| | | | | | | Only require sidekiq-limit_fetch when enabled in settings Closes #36253 See merge request !13715
* Merge branch '36458-user-profile-activity-feed-contains-broken-image-links' ↵Phil Hughes2017-08-222-1/+7
| | | | | | | | | into 'master' Resolve "User profile activity feed contains broken image links" Closes #36458 See merge request !13606
* Merge branch 'remove-user-bundle' into 'master'Tim Zallmann2017-08-221-1/+0
| | | | | Remove superfluous users bundle See merge request !13684
* Merge branch 'issue-boards-closed-shows-empty-label' into 'master'Tim Zallmann2017-08-222-1/+20
| | | | | | | Fixed issue boards closed list displaying empty label Closes #36650 See merge request !13658
* Merge branch 'repo-template-format-repo' into 'master'Clement Ho2017-08-221-3/+6
| | | | | | | Correct repo.vue template Closes #36415 See merge request !13452
* Merge branch 'dm-commit-cache-i18n' into 'master'Robert Speicher2017-08-222-1/+6
| | | | | | | Add current locale to commit partial cache key Closes #36591 See merge request !13669
* Merge branch 'gitaly-9-5-patch' into '9-5-stable-patch-1'Jose Ivan Vargas Lopez2017-08-224-7/+15
|\ | | | | | | | | Ensure Rugged methods are called with a Rugged Commit See merge request !13723
| * Ensure Rugged methods are called with a Rugged Commitgitaly-9-5-patchAlejandro Rodríguez2017-08-214-7/+15
| |
* | Update VERSION to 9.5.0v9.5.0Simon Knox2017-08-221-1/+1
| |
* | Update CHANGELOG.md for 9.5.0Simon Knox2017-08-22165-673/+166
| | | | | | [ci skip]
* | Update VERSION to 9.5.0-rc8v9.5.0-rc8Simon Knox2017-08-221-1/+1
|/
* Merge branch 'gitaly-0.33.0' into 'master'Douwe Maan2017-08-211-1/+1
| | | | | | Use Gitaly 0.33.0 See merge request !13671
* Merge branch 'docs/gpg-refactor' into 'master'Marcia Ramos2017-08-2115-87/+249
| | | | | Refactor GPG docs See merge request !13660
* Merge branch 'update-create-project-getting-started' into 'master'Achilleas Pipinellis2017-08-212-10/+7
| | | | | Update Create Project Getting Started See merge request !13687
* Merge branch 'sh-fix-protected-tags-delete' into 'master'Yorick Peterse2017-08-213-2/+42
| | | | | | | Fix Error 500s when attempting to destroy a protected tag Closes #36013 See merge request !13692
* Merge branch 'sh-fix-atom-feeds' into 'master'Sean McGivern2017-08-212-0/+16
| | | | | | | Fix 500 errors in Atom feeds due to push events Closes #36705 See merge request !13695
* Merge branch 'fly-out-update-for-stable' into '9-5-stable'Tim Zallmann2017-08-212-284/+68
|\ | | | | | | | | Fixes the stable branches fly out nav JS See merge request !13683
| * fixes for sidebar jumpingfly-out-update-for-stablePhil Hughes2017-08-192-33/+24
| |
| * Fixes the stable branches fly out nav JSPhil Hughes2017-08-182-254/+47
| |
* | Update VERSION to 9.5.0-rc6v9.5.0-rc6Jose Ivan Vargas2017-08-181-1/+1
| |
* | Merge branch '34533-speed-up-group-project-authorizations' into 'master'9-5-stable-prepare-RC6Douwe Maan2017-08-186-10/+88
| | | | | | | | | | | | | | Speed up Group#user_ids_for_project_authorizations Closes #36182 See merge request !13508
* | Merge branch ↵Grzegorz Bizon2017-08-182-1/+24
| | | | | | | | | | | | | | | | | | '36630-activerecord-statementinvalid-pg-notnullviolation-error-null-value-in-column-a_mode-violates-not-null-constraint' into 'master' Resolve "ActiveRecord::StatementInvalid: PG::NotNullViolation: ERROR: null value in column "a_mode" violates not-null constraint" Closes #36630 See merge request !13663
* | Merge branch ↵Achilleas Pipinellis2017-08-181-0/+4
| | | | | | | | | | | | | | | | | | 'docs/sm/36543-describe-supported-version-in-group_level_variables' into 'master' Describe the supported version of group-level variables API in document Closes #36543 See merge request !13648
* | Merge branch '35072-fix-pages-delete' into 'master'Sean McGivern2017-08-184-5/+47
| | | | | | | | | | | | | | Resolve "Deleting of a GitLab Pages project results in "`PagesWorker.perform_in` cannot be called inside a transaction"" Closes #35072 See merge request !13631
* | Merge branch 'tc-git-tower-pagination-links' into 'master'Grzegorz Bizon2017-08-183-10/+64
| | | | | | | | | | | | | | API: do not set rel="next" pagination header when no records found Closes #36618 See merge request !13629
* | Merge branch '36448-smiles-are-broken-in-9-5-0-rc2' into 'master'Clement Ho2017-08-181-1/+2
| | | | | | | | | | | | | | Fixes the blown up emoji problem in notes Closes #36448 and #36282 See merge request !13632
* | Merge branch 'issue_35580' into 'master'Rémy Coutable2017-08-184-24/+139
| | | | | | | | | | | | | | Fix project import to group when there are project milestones Closes #35580 See merge request !13482