Commit Graph
16253 Commits
Author SHA1 Message Date
Valery Sizov 851cfc50ea Merge branch 'fix_link_in_doc' into 'master'
Fix link to the CI documentation

See merge request !627
2015-05-08 12:22:48 +00:00
Valery Sizov 3a18eb8d3a Fix link to the CI documentation 2015-05-08 15:22:19 +03:00
Sytse Sijbrandij 8a413174a5 Merge branch 'backup_doc' into 'master'
Improved the backup documentation

See merge request !621
2015-05-08 12:16:08 +00:00
Valery Sizov b031a26376 improved backup doc 2015-05-08 15:10:04 +03:00
Dmitriy Zaporozhets 6c32abc5f7 Merge branch 'rs-task_list' into 'master'
Use task_list gem for task lists

Task Lists can now be used in comments, and they'll render in previews. 👏

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2271

See merge request !599
2015-05-08 09:39:48 +00:00
Dmitriy Zaporozhets 757084f715 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-08 12:27:08 +03:00
Dmitriy Zaporozhets 5b8712e4c2 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-05-08 12:26:58 +03:00
Dmitriy Zaporozhets dc76d102b4 Merge pull request #9254 from gitlabhq/revert-8800-email-settings
Revert "Allow to configure smtp and sendmail in gitlab.yml"
2015-05-08 12:16:40 +03:00
Job van der Voort 0384d2929f Merge branch 'sidekiq-memory-killer-shutdown-signal' into 'master'
Add SIDEKIQ_MEMORY_KILLER_SHUTDOWN_SIGNAL env var

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.

See merge request !1812
2015-05-08 09:01:10 +00:00
Valery Sizov cd2659fdb5 Merge branch 'tag_dup' into 'master'
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
2015-05-08 08:30:05 +00:00
Valery Sizov d881345ed7 Merge branch 'fix-mysql-migration-with-tags' into 'master'
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
2015-05-08 08:29:07 +00:00
Valery Sizov e1727f608b Merge branch 'conditional-delete-taggings-indices' into 'master'
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
2015-05-08 08:27:38 +00:00
Stan Hu f6c0ef5553 Conditionally remove indices that may not exist in pre-GitLab v6.7 installations
Closes #1593
2015-05-08 00:43:19 -07:00
Marin Jankovski 0fc6f0b5d4 Merge branch 'new-issue-after-release' into 'master'
new issue after release

See merge request !1810
2015-05-08 07:10:54 +00:00
Marin Jankovski 8b25ff6634 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-05-08 09:09:05 +02:00
Marin Jankovski 5dc84fa5ca Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-08 09:08:56 +02:00
Stan Hu 548cec6ea4 Change the MySQL collation type to utf8_bin to ensure case-sensitive tags are supported 2015-05-07 16:33:11 -07:00
Robert Speicher c4aa700398 Merge branch 'rs-fix-filter-tooltips' into 'master'
Fix tooltips for event filter links

See merge request !618
2015-05-07 21:51:51 +00:00
Douwe Maan f5f097b765 Merge branch 'feature/handle-big-diffs' into 'master'
Improve handling of large diffs

Diffs with a large number of changed lines time out (504 HTTP error) or
generate a HTML page that's so heavy web browsers struggle with it.

https://github.com/gitlabhq/gitlabhq/pull/5014 introduced limits on
commit line count so that only a safe portion is rendered. This was
later undone by code refactoring in be5b6db8, e0eb4803 and c741fcab.
This patch re-introduces a safe limit on number of lines.

See merge request !539
2015-05-07 19:29:55 +00:00
Jeroen van Baarsen 3a637d73d5 Merge pull request #9239 from Soullivaneuh/git-clone-holder
Fix bootlint issues on git clone holder bar
2015-05-07 19:08:55 +02:00
Jacob Vosmaer 1c1f18b416 Add SIDEKIQ_MEMORY_KILLER_SHUTDOWN_SIGNAL env var
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.
2015-05-07 18:47:03 +02:00
Sullivan SENECHAL f972a9e34c Fix bootlint issues on git clone holder bar 2015-05-07 18:32:10 +02:00
Valery Sizov b60717604c remove tag duplicates 2015-05-07 18:17:58 +03:00
Job van der Voort 4164f6155a new issue after release 2015-05-07 14:26:21 +00:00
Job van der Voort 0ccc4f19d0 Merge branch 'add_yanking_pkg_example' into 'master'
Add yanking pkg example to the release documentation.

See merge request !1809
2015-05-07 14:18:45 +00:00
Marin Jankovski e7dc9ca2d0 Add yanking pkg example to the release documentation. 2015-05-07 16:15:58 +02:00
Job van der Voort 415648e255 revert to 7.10.1 2015-05-07 13:39:10 +00:00
Sytse Sijbrandij 93a2cc095b Fix spelling error, thanks Mark 2015-05-07 12:41:05 +00:00
Job van der Voort 895bc33fef Update upgrader doc to point to 7.10.2 2015-05-07 12:24:18 +00:00
Sytse Sijbrandij cceb2dd206 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-07 14:22:39 +02:00
Sytse Sijbrandij deddad6025 Document sidekiq restarting functionality. 2015-05-07 14:22:14 +02:00
Sytse Sijbrandij 93e2c72299 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-05-07 14:12:12 +02:00
Valery Sizov bc45469b6a Link to CI backup documentation 2015-05-07 13:34:59 +03:00
Douwe Maan 7a23be3ab7 Merge branch 'fix-default-branch' into 'master'
Make the first branch pushed to an empty repository the default HEAD

In an empty repository, pushing a new branch not called "master" would leave HEAD in an unknown state, causing ambiguity if another branch were pushed. This could in turn cause a new protected branch to be created and cause the default branch to change.

* Closes #1561
* Closes #1576
* Closes https://github.com/gitlabhq/gitlabhq/issues/8883

See merge request !614
2015-05-07 10:28:50 +00:00
Sytse Sijbrandij 60887cf949 Remove the volumes from the single image to keep it simple. 2015-05-07 10:47:24 +02:00
Job van der Voort f34f5f362a Merge branch 'revert-bad-mr' into 'master'
revert bad link in documentation

See merge request !1808
2015-05-07 08:42:40 +00:00
Job van der Voort 5b534a287a revert bad link in documentation 2015-05-07 10:42:17 +02:00
Job van der Voort 007d4af19c Merge branch 'Added_link_reset_root_password' into 'master'
Added link reset root password

Added text to link "How to reset root password"

cc/ @sytse

See merge request !1799
2015-05-07 08:36:47 +00:00
Sytse Sijbrandij b18dfc8d40 No need to commit when using a dockerfile. 2015-05-07 10:24:55 +02:00
Sytse Sijbrandij cb4e16b7a3 Ignore mounted Docker directories. 2015-05-07 10:24:38 +02:00
Sytse Sijbrandij 66f7cdeb0a Cleanup the order of the docker manual a bit more. 2015-05-07 09:38:54 +02:00
Sytse Sijbrandij 9edabac522 Put the retrieval of published images first. 2015-05-07 09:33:13 +02:00
Sytse Sijbrandij 661142ca4a Add headers and reduce duplication. 2015-05-07 09:21:32 +02:00
Sytse Sijbrandij 3f8d487e3d Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-07 09:10:50 +02:00
Sytse Sijbrandij 2576971f39 Forgot to link the third directory, thanks Ben. 2015-05-07 09:10:35 +02:00
Robert Speicher 9d34efb5cf Merge branch 'rs-issue-1348' into 'master'
Add Markdown feature specs for markup inside links

It was already working, just want to make sure we don't break it in the future.

See merge request !619
2015-05-07 01:10:55 +00:00
Robert Speicher da8d6feb2c Add CHANGELOG entry for latest task lists
[ci skip]
2015-05-06 21:06:18 -04:00
Robert Speicher cca28c7920 Update Markdown help docs for latest changes 2015-05-06 21:04:33 -04:00
Robert Speicher cb079c8208 Fix Markdown feature spec 2015-05-06 20:43:12 -04:00
Robert Speicher 0cc7536341 Fix header link anchors 2015-05-06 18:38:43 -04:00