home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 02:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Speicher a42c548a8d Use File.join instead of Rails.root.join in HelpController 2015-08-18 09:08:03 -07:00
Robert Speicher 204914983a Merge branch 'fix-authhash-infinite-loop' into 'master' 
Fix infinite loop when SAML was incorrectly configured.

See merge request !1170
 2015-08-18 15:56:30 +00:00
Robert Speicher 04e1c4d3da Merge branch 'fix-rake-info' into 'master' 
Fix gitlab:env:info rake task.

Found doing QA.

See merge request !1169
 2015-08-18 15:47:38 +00:00
Dmitriy Zaporozhets 89beb39fcc Make sure blog post MR has WIP keyword 2015-08-18 14:46:01 +00:00
Stan Hu 2b127c3fd2 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-18 06:46:44 -07:00
Dmitriy Zaporozhets 798f2fe19f Merge branch 'mr-source-branch-clear-cache' into 'master' 
Clear cache to prevent listing deleted branches after MR removes source branch

Closes #2272

See merge request !1160
 2015-08-18 13:16:46 +00:00
Stan Hu cc871c0c74 Merge pull request #9564 from bbodenmiller/robots.txt 
disallow irrelevant pages by defaults in robots
 2015-08-18 03:43:39 -07:00
Stan Hu adebf70220 Merge pull request #9436 from bbodenmiller/patch-4 
capitalize URL in "Home page URL"
 2015-08-18 03:43:22 -07:00
Ben Bodenmiller 692e381e0c capitalize URL in "Home page URL" 2015-08-17 23:16:18 -07:00
Ben Bodenmiller 595a93ee2c disallow irrelevant pages by default in robots 
Update default robots.txt rules to disallow irrelevant pages that search
engines should not care about. This will still allow important pages
like the files, commit details, merge requests, issues, comments, etc.
to be crawled.
 2015-08-17 23:11:16 -07:00
Stan Hu 2a704396fb Fix incorrect CHANGELOG version 2015-08-17 19:29:06 -07:00
Stan Hu 5fad0b585e Merge branch 'bump-gitlab-git' into 'master' 
Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodules

Closes #2262

See merge request !1171
 2015-08-18 00:48:49 +00:00
Stan Hu 47d55306d9 Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodules 
Closes #2262
 2015-08-17 23:56:02 +00:00
Douwe Maan 262c6f11fe Merge branch 'rs-remove-gfm_with_options' into 'master' 
Remove the `gfm_with_options` helper

It was redundant because `gfm` also took options.

See merge request !1152
 2015-08-17 23:42:29 +00:00
Douwe Maan c16b1651f5 Fix infinite loop when SAML was incorrectly configured. 2015-08-17 16:39:22 -07:00
Douwe Maan c9920c422d Merge branch 'fix-backslashes-inline-diff' into 'master' 
Fix bug where backslashes in inline diffs could be dropped

This MR fixes a bug in inline diff generation causing backslashes to be dropped. For example, the input:

```
input.to_s.sub(/[\r\n].+/,'').sub(/\\[rn].+/, '').strip
```

The second backslash is dropped in the second `sub` statement:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/16e513894f7ecda1b111fe7d43e7f388/image.png)

With this fix, it looks like:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/90fd635a937a68f1b2403740ebc75e3a/image.png)

Closes #2253

See merge request !1143
 2015-08-17 23:33:36 +00:00
Douwe Maan f4cb6e438a Merge branch 'code-import-error-ui-improvements' into 'master' 
Improve error message display when project fails to import

Follow-up to !1134.

New screenshot:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/c1a8ffa30ab3b78010e16cf65c2ff438/image.png)

See merge request !1138
 2015-08-17 23:31:51 +00:00
karen Carias 10491b5438 deleted line 2015-08-17 14:42:34 -07:00
Dmitriy Zaporozhets 1e73e5dc14 Merge pull request #9565 from gitlabhq/revert-9528-Fixed_alignment_issue 
Revert "Fix for #9527"
 2015-08-17 18:30:21 +02:00
Dmitriy Zaporozhets 50696ce1d3 Revert "Fix for #9527" 2015-08-17 18:29:54 +02:00
Dmitriy Zaporozhets 478514b35b Merge branch 'installation-update-guides' into 'master' 
Installation and update guides for 7.14

cc @rspeicher

See merge request !1168
 2015-08-17 16:01:40 +00:00
Dmitriy Zaporozhets 5d862509c3 Create update guides for 7.14 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-17 17:18:09 +02:00
Dmitriy Zaporozhets dcd3396337 Update installation guide with 7.14 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-17 17:13:33 +02:00
Douwe Maan 02532d5873 Fix gitlab:env:info rake task. 2015-08-17 12:41:47 +02:00
Dmitriy Zaporozhets 4a0fa27017 Merge branch 'master' into remove-satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-17 11:41:53 +02:00
Dmitriy Zaporozhets bbe0e58aeb Merge branch 'pre-receive-wo-satellites' into 'remove-satellites' 
Add support of pre-receive hooks without satellites

Implement commit transaction with pre-receive and post-receive hooks for web editor and merge

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1154
 2015-08-17 09:18:43 +00:00
Dmitriy Zaporozhets e02cff19ed Fix typo in text when raise pre-receive exception 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-17 10:47:29 +02:00
Dmitriy Zaporozhets 3b93856e13 save repo empty state into variable for proper result 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-17 10:24:25 +02:00
Ben Bodenmiller ea9b8fe5f1 check uploads dir 
Detect issues with uploads dir, e.g. permission and ownership issues
with the users uploads dir. This helps troubleshoot and correct
gitlab-org/omnibus-gitlab#311. Fixes gitlabhq#7500, gitlabhq#7052.
Related to gitlabhq#6281.
 2015-08-16 16:57:15 -07:00
Robert Speicher 9f7c7c857b Merge branch 'rs-check-ruby-version' into 'master' 
Require Ruby 2.1.0 in `gitlab:app:check` task

See merge request !1165
 2015-08-16 00:06:36 +00:00
Robert Speicher 33c818d2d8 Require Ruby 2.1.0 in gitlab:app:check task 
[ci skip]
 2015-08-15 20:04:52 -04:00
Robert Schilling 18cbf07f8a Merge branch 'changelog-1124' into 'master' 
Update changelog for MR !1124

@dzaporozhets

See merge request !1164
 2015-08-15 22:06:19 +00:00
Sven Strickroth 18e9b01059 Update changelog for MR !1124 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2015-08-15 23:11:04 +02:00
Robert Speicher 0b5dc5cd52 Merge branch 'rs-gem-security' into 'master' 
Bump omniauth-saml to 1.4.1

Updates a vulnerable `ruby-saml` dependency.

- https://github.com/onelogin/ruby-saml/commit/9853651b96b99653ea8627d757d46bfe62ab6448
- https://github.com/onelogin/ruby-saml/pull/247

See merge request !1162
 2015-08-15 03:30:15 +00:00
Robert Speicher adfcd57296 Bump omniauth-saml to 1.4.1 
Updates a vulnerable `ruby-saml` dependency.

- https://github.com/onelogin/ruby-saml/commit/9853651b96b99653ea8627d757d46bfe62ab6448
- https://github.com/onelogin/ruby-saml/pull/247
 2015-08-14 22:24:21 -04:00
Stan Hu 87ec6ae3a5 Merge branch 'fix/redirect_after_sign_in' into 'master' 
Fix redirection after sign in when using auto_sign_in_with_provider

Logic for redirect path moved to a filter. This allows it to run properly when the auto_sign_in_with_provider filter takes control.

See merge request !1146
 2015-08-14 19:45:01 +00:00
Stan Hu 494afae08d Merge branch 'mysql_insecure_password_warnings' into 'master' 
Workaround the insecure password warnings emitted by MySQL 5.6

When using MySQL 5.6, the following output is emitted every time a backup is created, even with CRON=1.

```
Warning: Using a password on the command line interface can be insecure.
```

This fix works around that by sending the password via the [`MYSQL_PWD`](http://dev.mysql.com/doc/refman/5.6/en/environment-variables.html) environment variable.

See merge request !1139
 2015-08-14 17:12:57 +00:00
Stan Hu 317b7ad3e8 Merge pull request #9528 from revaret/Fixed_alignment_issue 
Fix for #9527
 2015-08-14 09:12:34 -07:00
Dmitriy Zaporozhets a608e45e6b Remove unnecessary file 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-14 17:56:36 +02:00
Dmitriy Zaporozhets 9ea37cda3f merge with support of pre-receive and post-receive hooks 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-14 17:52:49 +02:00
Stan Hu d416a9d624 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-14 08:51:49 -07:00
Stan Hu 5824766252 Merge pull request #9562 from bladealslayer/fix/flowdock-gem-update 
Update Flowdock integration to support new Flowdock API
 2015-08-14 08:34:51 -07:00
Boyan Tabakov 88ab815b38 Update Flowdock integration to support new Flowdock API 
Requires that users create a Git source in their flows and update the configured token to the Git source token. The old flow tokens can't be used.
 2015-08-14 16:45:23 +02:00
Dmitriy Zaporozhets f4149bcddc Refactor how repository makes commit with pre/post receive hooks 2015-08-14 16:23:40 +02:00
Stan Hu 6e808fc222 Clear cache to prevent listing deleted branches after MR removes source branch 
Closes #2272
 2015-08-14 07:09:25 -07:00
Dmitriy Zaporozhets 4e4866f255 Refactor pre/post receive commit services into one class 2015-08-14 16:04:17 +02:00
Dmitriy Zaporozhets bacad39ef9 Make sure target has not changed during pre-receive hook 2015-08-14 15:22:48 +02:00
Dmitriy Zaporozhets 9649f9387a Fix tests for web editor 2015-08-14 15:08:31 +02:00
Dmitriy Zaporozhets 9011a32234 Disable pre-receive check in test env 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-14 13:27:51 +02:00
Dmitriy Zaporozhets 3483024d93 Merge branch 'disable-internal-tracker-when-external-in-use' into 'master' 
Disable internal issue tracker if external tracker in use

### What does this MR do?

This MR disables routes to the internal issue tracker if an external issue tracker (e.g. Redmine) is in use. A 404 page is returned if a user attempts to access any of the issue routes.

### Why was this MR needed?

Enabling the external issue tracker would still keep the internal one active, which would lead to odd behavior where users could create issues but not close them.

### What are the relevant issue numbers?

Closes #2006

See merge request !993
 2015-08-14 11:01:43 +00:00