Commit Graph
16295 Commits
Author SHA1 Message Date
Douwe Maan 8e4dcbb8fb Merge branch 'fix-tags-view-with-submodules' into 'master'
Bump gitlab_git to 7.1.11 to fix bug with viewing a tag on a project with submodules

This is a reminder MR to bump gitlab_git before the release. Tests will fail until this happens.

Closes https://github.com/gitlabhq/gitlabhq/issues/8411

See merge request !607
2015-05-12 09:11:45 +00:00
Douwe Maan f84e78f3d7 Merge branch 'commit_time_timezone' into 'master'
Fix commit time being displayed in the wrong timezone in some cases

This MR makes sure that the displayed commit date is shown in the timezone that's configured in the gitlab.yml.
Before it was possible that the `committed_date` of a commit would display different values on the dashboard and the commit page.

fixes gitlab-org/gitlab-ce#1278

/cc @DouweM

See merge request !624
2015-05-12 07:49:10 +00:00
Dmitriy Zaporozhets 9694c8164d Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-11 22:45:13 +03:00
Dmitriy Zaporozhets f1ba3769bd Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-05-11 22:44:21 +03:00
Dmitriy Zaporozhets e1a8089cc2 Merge branch 'create-merge-request' into 'master'
Add Create Merge Request buttons to commits page and push event.

Commits page:

![Screen_Shot_2015-05-09_at_22.27.09](https://gitlab.com/gitlab-org/gitlab-ce/uploads/f77c2e47f768b2fc132de6e3a2a0323e/Screen_Shot_2015-05-09_at_22.27.09.png)

Branches page:

![Screen_Shot_2015-05-09_at_22.55.24](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b0a6374f5c5d830ef19de9694e603c8f/Screen_Shot_2015-05-09_at_22.55.24.png)

Push event: (Only for new branches, and only shown to the pushing user)

![Screen_Shot_2015-05-09_at_22.27.21](https://gitlab.com/gitlab-org/gitlab-ce/uploads/989c9cb66ee03d09b96809452749d2b8/Screen_Shot_2015-05-09_at_22.27.21.png)

Push event with multiple commits and a Compare link:

![Screen_Shot_2015-05-09_at_22.28.01](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a70c718e559f69177f9341c0af92707c/Screen_Shot_2015-05-09_at_22.28.01.png)

See merge request !632
2015-05-11 19:43:56 +00:00
Dmitriy Zaporozhets 95a470cf50 Merge branch 'params-to-sym' into 'master'
Don't symbolize params.

See merge request !636
2015-05-11 15:49:08 +00:00
Sytse Sijbrandij 881e11df1b Small improvements to style guide. 2015-05-11 14:48:39 +00:00
Sytse Sijbrandij 426fa2af91 Merge branch 'migration-style-guide' into 'master'
Migration Style Guide

Fixes #2305

See merge request !1821
2015-05-11 14:43:26 +00:00
Jeroen van Baarsen 3a1eba6f14 Merge pull request #8799 from jirutka/group-kerberos
Make omniauth-kerberos dependency optional (add group 'kerberos')
2015-05-11 15:11:40 +02:00
Job van der Voort 6a6047f80c create migration style guide. Fixes #2305 2015-05-11 15:09:36 +02:00
Jakub Jirutka f676bbf918 Update installation instructions, make kerberos optional 2015-05-11 13:37:56 +02:00
Jakub Jirutka 2391a43a70 Make omniauth-kerberos dependency optional (add group 'kerberos') 2015-05-11 13:27:51 +02:00
Dmitriy Zaporozhets 396aba5e10 Merge branch 'brakeman-system' into 'master'
Follow shell command guidelines in Brakeman task

There is no real issue here because the shell command is completely
static, but it is still nicer to just follow the guidelines in
doc/development/shell_commands.md .

See merge request !1819
2015-05-11 10:00:42 +00:00
Douwe Maan 783b286ac0 Don't symbolize params. 2015-05-11 11:55:02 +02:00
Jacob Vosmaer 0a47d8f3f4 Follow shell command guidelines in Brakeman task
There is no real issue here because the shell command is completely
static, but it is still nicer to just follow the guidelines in
doc/development/shell_commands.md .
2015-05-11 11:11:03 +02:00
Marin Jankovski 6fdc51f81d Merge branch 'bug/fix-duplicate-deploy-keys' into 'master'
Don't show duplicate deploy keys

This fixes the issue described in [#1516](https://gitlab.com/gitlab-org/gitlab-ce/issues/1516) where you would see the same deploy key multiple times if it was used by multiple projects.

See merge request !629
2015-05-10 07:21:39 +00:00
Douwe Maan aa4d199044 Fix commits feed button. 2015-05-10 00:39:20 +02:00
Douwe Maan a3edd473b9 Improve create_mr_button? performance. 2015-05-09 23:51:50 +02:00
Douwe Maan e80c4447a8 Fix spec. 2015-05-09 23:50:51 +02:00
Douwe Maan 164d474488 Add Merge Request button to branches page. 2015-05-09 22:55:19 +02:00
Douwe Maan 722e393589 Add Create Merge Request buttons to commits page and push event. 2015-05-09 22:26:52 +02:00
Douwe Maan 8f75ab21d0 Link Commits tab to current branch from Compare page. 2015-05-09 22:25:52 +02:00
Dmitriy Zaporozhets 40c8295a24 Merge branch 'rs-disallow-id-class' into 'master'
Remove class and id attributes from SanitizationFilter whitelist

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

See merge request !631
2015-05-09 06:08:42 +00:00
Maran a0fd2eb568 Don't show duplicate deploy keys. Fixes #1516 2015-05-08 21:32:03 +02:00
Dmitriy Zaporozhets 15bbb4ee1a Merge pull request #9244 from dreis2211/firefox_issuable_filter_patch
Fix Firefox problems when it wants to render issuable component
2015-05-08 22:24:51 +03:00
Dmitriy Zaporozhets 5af7d789f5 Merge branch 'show_project_visibility' into 'master'
Move project visibility from clone bar to repository details block for non empty project.

See merge request !1818
2015-05-08 18:20:53 +00:00
Robert Speicher 70bbf093aa Remove class and id attributes from SanitizationFilter whitelist 2015-05-08 12:31:34 -04:00
Marin Jankovski 15909d6411 Move project visibility from clone bar to repository details block for non empty project. 2015-05-08 18:12:07 +02:00
Marin Jankovski d9b6b9201e Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-05-08 17:07:37 +02:00
Job van der Voort 1c911b430c Merge branch 'How_to_Reset_your_root_password' into 'master'
How to reset your root password

Added link and file correctly on Security doc.

Please review to make sure it's correct.

See merge request !1811
2015-05-08 14:36:50 +00:00
Job van der Voort c74a0be9f8 make it more obvious what happens in the code 2015-05-08 14:36:24 +00:00
Job van der Voort 83c5aa6888 remove redundant colon 2015-05-08 14:35:05 +00:00
Valeriy Sizov f682a6adb9 Merge pull request #9214 from Bugagazavr/hook-events
Added X-GitLab-Event header for web hooks
2015-05-08 17:17:01 +03:00
Valery Sizov a1399c3c30 Merge branch 'quote_string' into 'master'
Adding quote_string to migration

See merge request !630
2015-05-08 14:09:51 +00:00
Valery Sizov 3bc717f010 Adding quote_string to migration 2015-05-08 16:54:45 +03:00
bugagazavr acac788902 Added X-GitLab-Event header for web hooks 2015-05-08 16:49:03 +03:00
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