summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Version 7.10.3v7.10.3Job van der Voort2015-05-081-1/+1
|
* Merge branch '7-10-3' into '7-10-stable'Dmitriy Zaporozhets2015-05-086-7/+47
|\ | | | | | | | | | | | | | | 7.10.3 cc @job See merge request !1816
| * Merge branch 'fix-mysql-migration-with-tags' into 'master'Valery Sizov2015-05-081-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | Change the MySQL collation type to utf8_bin to ensure case-sensitive tags are supported MySQL tables had a collation type of utf8_ci, which makes the name case-insensitive. Previously this migration was run only after indices were built, but it needs to happen before if there is existing data that is case-sensitive. This is an idempotent change, so applying it again in the existing migration (20150425164651) should not change anything. This is related to !623, but this migration should run before that one. * Closes #1589 * Closes https://github.com/gitlabhq/gitlabhq/issues/9255 See merge request !625
| * Merge branch 'conditional-delete-taggings-indices' into 'master'Valery Sizov2015-05-081-2/+9
| | | | | | | | | | | | | | | | | | | | Conditionally remove indices that may not exist in pre-GitLab v6.7 installations In pre-GitLab v6.7 installations, the `tagging` indices were directly added to the init schema and not added in a migration. Anyone using this older DB schema may not have these indicies, so only remove them if they are there. Closes #1593 See merge request !626
| * Merge branch 'tag_dup' into 'master'Valery Sizov2015-05-081-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove tag duplicates Prevention of getting this error: ``` ActiveRecord::RecordNotUnique: PG::Error: ERROR: could not create unique index "index_tags_on_name" DETAIL: Key (name)=(XSS') is duplicated. : CREATE UNIQUE INDEX "index_tags_on_name" ON "tags" ("name") ``` This migration fails if there are duplicates: https://github.com/mbleigh/acts-as-taggable-on/blob/v3.5.0/db/migrate/2_add_missing_unique_indices.rb#L3 See merge request !623
| * Add SIDEKIQ_MEMORY_KILLER_SHUTDOWN_SIGNAL env varJacob Vosmaer2015-05-083-5/+12
| | | | | | | | | | | | | | It looks like SIGTERM may not be enough to shut down a Sidekiq process when its RSS has gotten too big. This change will allow us to experiment with sending SIGKILL instead of SIGTERM to Sidekiq processes on gitlab.com.
* | Version 7.10.2v7.10.2Job van der Voort2015-05-061-1/+1
|/
* Merge branch '7-10-stable' of github.com:gitlabhq/gitlabhq into 7-10-stableDmitriy Zaporozhets2015-05-061-2/+2
|\
| * Docker: update omnibus packageJakob Englisch2015-05-051-2/+2
| |
* | Merge branch '7-10-2' into '7-10-stable'Dmitriy Zaporozhets2015-05-0621-10/+194
|\ \ | |/ |/| | | | | | | Fixes for 7.10.2 See merge request !1804
| * Merge branch 'fix-commit-data-url-generation' into 'master'Douwe Maan2015-05-063-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where commit data would not appear in some subdirectories Fix issue where commit data would not show up in some subdirectories due to escaped slashes. For example: https://gitlab.common-lisp.net/ecl/ecl/tree/develop/src/gc (now patched with fix) The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b76ed) caused slashes in a tree to be escaped automatically. Using a wildcard glob in the route prevents this behavior. * Closes #1478, #1459 * Closes https://github.com/gitlabhq/gitlabhq/issues/9037 See merge request !581
| * Merge branch 'fix-escaped-branches-in-compare' into 'master'Douwe Maan2015-05-063-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | Unescape branch names in compare commit The upgrade in GitLab v7.9 to Rails v4.1.9 caused all branch names in the compare commit mode to be escaped (e.g. `/` to `%2F`). The compare mode would not always work when comparing against branch names with a forward slash. Opted to unescape the branch name rather than use a wildcard segment to prevent escaping slashes because it seems like a more sensible URL. The slashes in this case aren't really represented by a tree structure (e.g. /compare/one/two/branch..another/branch/here). * Closes #1399 * Closes https://github.com/gitlabhq/gitlabhq/issues/9105 See merge request !582
| * Merge branch 'fix-project-tags' into 'master'Douwe Maan2015-05-068-2/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix DB error when trying to tag a repository Steps to reproduce: Go to a project settings, add tags, click on save changes Observed behavior: Error 500 ``` PG::Error: ERROR: column "taggings_count" does not exist LINE 1: UPDATE "tags" SET "taggings_count" = COALESCE("taggings_coun... ``` Ran `rake acts_as_taggable_on_engine:install:migrations`, removed the first migration that created the `tags` and `taggings` table, and added the rest. * Closes #1512 * Closes #1550 * Closes https://github.com/gitlabhq/gitlabhq/issues/6867 * Closes https://github.com/gitlabhq/gitlabhq/issues/9194 See merge request !577
| * Merge branch 'fix-wiki-search' into 'master'Dmitriy Zaporozhets2015-05-065-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when searching Wiki pages If a Wiki page turns up a hit in the search results, an error will occur: ``` Completed 500 Internal Server Error in 836ms NoMethodError - undefined method `slug' for "test.markdown":String: app/helpers/wiki_helper.rb:10:in `namespace_project_wiki_path' app/views/search/results/_wiki_blob.html.haml:4:in `_app_views_search_results__wiki_blob_html_haml___2752621660395393333_70299911622700' actionview (4.1.9) lib/action_view/template.rb:145:in `block in render' activesupport (4.1.9) lib/active_support/notifications.rb:161:in `instrument' actionview (4.1.9) lib/action_view/template.rb:339:in `instrument' actionview (4.1.9) lib/action_view/template.rb:143:in `render' ``` An unhandled String containing the name of the Wiki page would be provided to the URL path generator. This MR handles that case. Closes #1547 See merge request !592
| * Merge branch 'fix_ci_services' into 'master'Dmitriy Zaporozhets2015-05-063-2/+7
| | | | | | | | | | | | | | | | Fix CI links on MR page Fixes gitlab-org/gitlab-ci#145 See merge request !609
| * Merge branch 'admin-add-group-members' into 'master'Dmitriy Zaporozhets2015-05-062-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | Fix adding new group members from admin area Fix for #2222 Tests for this case already exists but it was green. It related to current way dealing with ajax selectbox. Improving tests might be a reason for another merge requests - everyone is welcome to participate. See merge request !1796
| * Merge branch 'fix-gitorious-importer' into 'master'Dmitriy Zaporozhets2015-05-063-2/+3
|/ | | | | | | | Get Gitorious importer to work again. Fixes #1504. See merge request !576
* Version 7.10.1v7.10.1Job van der Voort2015-04-291-1/+1
|
* Remove abandoned GroupMembersValery Sizov2015-04-292-1/+7
| | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: db/schema.rb
* Version 7.10.0v7.10.0Job van der Voort2015-04-221-1/+1
|
* Merge branch 'rs-issue-2257' into 'master'Dmitriy Zaporozhets2015-04-222-4/+18
| | | | | | | | | | Recover from URI::Error `URI::Error` is the base class for all URI errors. Fixes #2257 and #2260 See merge request !1789
* Merge branch 'rs-toggle-tab' into 'master'Dmitriy Zaporozhets2015-04-221-2/+2
| | | | | | | | | | Fix tab behavior on MergeRequests#new Missed this one in 269aee790c48619a92f416c8555cb4623da62ca3 Prior to this fix, clicking the Commits or Changes tab when creating a new MR would reload the page instead of display the tab contents. See merge request !556
* Merge branch 'update_grack' into 'master'Dmitriy Zaporozhets2015-04-222-4/+4
| | | | | | | | Update gitlab-grack to 2.0.2. Updating to grack version 2.0.2 to fix an issue with smart http clients. See merge request !559
* Version 7.10.0.rc8v7.10.0.rc8Job van der Voort2015-04-211-1/+1
|
* Merge branch '7-10-rc5' into '7-10-stable'Dmitriy Zaporozhets2015-04-2115-99/+200
|\ | | | | | | | | | | | | | | 7.10.0.rc5 cc @job See merge request !1787
| * Merge branch 'upgrade-guide-gitlab-shell' into 'master'Dmitriy Zaporozhets2015-04-211-1/+1
| | | | | | | | | | | | | | | | 7.10 requires gitlab-shell 2.6.2. Fixes #1467. See merge request !552
| * Merge branch 'gitlab-grack-2.0.1' into 'master'Dmitriy Zaporozhets2015-04-212-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Update gitlab-grack to 2.0.1 to get unicorn to stop creating zombies. Addresses #1461 and private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2253. This regression was introduced between 7.9 and the 7.10 rcs, so no changelog item for 7.10 proper. cc @JobV @jacobvosmaer See merge request !546
| * Merge branch 'google-code-fixes' into 'master'Dmitriy Zaporozhets2015-04-214-32/+72
| | | | | | | | | | | | | | | | Fix some issues with Google Code importer Thanks, @mrtux, for reporting all of these. See merge request !551
| * Merge branch 'rs-issue-2212' into 'master'Dmitriy Zaporozhets2015-04-218-63/+124
|/ | | | | | | | Revert and re-fix image rendering in help pages Closes #2212 See merge request !1765
* Version 7.10.0.rc4v7.10.0.rc4Job van der Voort2015-04-201-1/+1
|
* Merge branch '7-10-rc4' into '7-10-stable'Dmitriy Zaporozhets2015-04-2011-108/+286
|\ | | | | | | | | | | | | | | Changes for 7.10.0.rc4 cc @job @douwe See merge request !1785
| * Merge branch 'revert-username-period' into 'master'Dmitriy Zaporozhets2015-04-203-79/+2
| | | | | | | | | | | | | | | | Revert disallowing usernames to end in period. cc @JobV @jacobvosmaer See merge request !545
| * Merge branch 'haynes/gitlab-ce-remove_access_control_for_images' into 'master'Dmitriy Zaporozhets2015-04-203-7/+252
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove access control for uploaded images to fix broken images in emails Replaces !530. > This MR removes the access control for uploaded images. This is needed to display the images in emails again. > > The previous solution to base64 encode the images had to be reverted, because not all email clients supported it. > > If possible this should go into the 7.10 release. See merge request !533
| * Merge branch 'fix-label-color' into 'master'Dmitriy Zaporozhets2015-04-201-16/+16
| | | | | | | | | | | | | | | | Parse GFM references after sanitizing Parse GFM references - labels, issues, MRs, etc. - after calling the HTML Pipeline `SanitizationFilter` so that we can use non-whitelisted attributes like `style`. See #2188. See merge request !1745
| * Ignore submodules that are defined in .gitmodules but are checked in as ↵Douwe Maan2015-04-203-3/+5
| | | | | | | | directories.
| * Fix Resource Owner Password Authentication FlowRoshan Gautam2015-04-202-2/+8
| |
| * Merge branch 'fix-label-color-input' into 'master'Dmitriy Zaporozhets2015-04-202-1/+3
|/ | | | | | | | | | Fix label color input. Because `value` was set, every label color would render as purple in the form. Introduced by 83b5a9ae2bfb594bcb5a9a931d6781ba05c9b9ef between 7.9 and 7.10, so no changelog item. See merge request !538
* Version 7.10.0.rc3v7.10.0.rc3Job van der Voort2015-04-201-1/+1
|
* Merge branch '7-10-rc3' into '7-10-stable'Dmitriy Zaporozhets2015-04-1715-85/+144
|\ | | | | | | | | | | | | | | | | | | | | | | | | Fixes for 7.10.0.rc3 content - [ ] Update gitlab_git to ignore invalid lines in .gitmodules. - [ ] Add a task that checks repository integrity with `git fsck`. - [ ] Decrease memory use and increase performance of Google Code importer. - [ ] Fix username period migration to preserve uniqueness of names and paths. See merge request !1783
| * Merge branch 'google-code-import-performance' into 'master'Dmitriy Zaporozhets2015-04-179-77/+106
| | | | | | | | | | | | | | | | Decrease memory use and increase performance of Google Code importer. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2241. See merge request !536
| * Update gitlab_git to ignore invalid lines in .gitmodules.Douwe Maan2015-04-173-3/+14
| |
| * Add new rake taskVinnie Okada2015-04-172-0/+18
| | | | | | | | Add a task that checks repository integrity with `git fsck`.
| * Fix username period migration to preserve uniqueness of names and paths.Douwe Maan2015-04-172-5/+6
|/
* Version 7.10.0.rc2v7.10.0.rc2Job van der Voort2015-04-161-1/+1
|
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-164-7/+7
|\
| * Merge pull request #9131 from chulkilee/ruby-2.1.6Dmitriy Zaporozhets2015-04-163-6/+6
| |\ | | | | | | ruby 2.1.6
| | * ruby 2.1.6Chulki Lee2015-04-133-6/+6
| | | | | | | | | | | | https://www.ruby-lang.org/en/news/2015/04/13/ruby-2-1-6-released/
| * | Merge pull request #9094 from bbodenmiller/patch-1Jeroen van Baarsen2015-04-161-1/+1
| |\ \ | | | | | | | | update text to reference new location of setting
| | * | update text to reference new location of settingBen Bodenmiller2015-04-051-1/+1
| | | |
* | | | Merge branch 'update-install-guides-710' into 'master'Job van der Voort2015-04-162-13/+13
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | update guides for 7.10 See merge request !1779
View Lorry Controller Status