home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 19:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,258 Commits 48 Branches 340 Tags
01c5ecedd405fed29dbae11039ecb1a90f170c28
Commit Graph
18258 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Douwe Maan 01c5ecedd4 Add "Reply to this email directly" to notification footer. 2015-08-19 10:17:51 -07:00
Douwe Maan 6b31827a41 Include display name with reply to address. 2015-08-19 10:17:32 -07:00
Douwe Maan 4f34d363a5 Correctly set Message-ID for comment notifications. 2015-08-19 10:17:20 -07:00
Douwe Maan 73eef57d5e Make MR notification email subject more standard. 2015-08-19 10:16:30 -07:00
Douwe Maan 8906cabae7 Changes and stuff. 2015-08-18 17:02:26 -07:00
Douwe Maan a428838dc0 Update mail_room 2015-08-18 15:50:46 -07:00
Douwe Maan f76eac56b9 Reply by email POC 2015-08-18 15:46:36 -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
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
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
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
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
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 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
Dmitriy Zaporozhets b6bdd650a5 Merge branch 'improve-readability' into 'master' 
Set max-width for README, issue and merge request description

It allows easier text reading on big screens

### Problem

Text is hard to read on wide screens:

![Screenshot_2015-08-14_11.33.39](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2bdb092c09495c7aa94b0589df4b7e65/Screenshot_2015-08-14_11.33.39.png)

### Solution

Set max-width to content. Screenshots:

![Screenshot_2015-08-14_11.31.54](https://gitlab.com/gitlab-org/gitlab-ce/uploads/00cd7a77b81b30458a1675ec562d7463/Screenshot_2015-08-14_11.31.54.png)
![Screenshot_2015-08-14_10.53.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4756f87a3bbb7179e55b1c8f8ee40459/Screenshot_2015-08-14_10.53.16.png)

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

See merge request !1161
 2015-08-14 10:55:08 +00:00
Dmitriy Zaporozhets 8b9c129016 Add CHANGELOG item 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-14 11:35:48 +02:00
Dmitriy Zaporozhets ec910c3307 Set max-width for README, issue and merge request description 
It allows easier text reading on big screens

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-14 11:29:45 +02:00
Dmitriy Zaporozhets e8889b154e Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-14 11:20:39 +02:00
Dmitriy Zaporozhets 5f2562dfc5 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-08-14 11:20:18 +02:00
Dmitriy Zaporozhets b665833370 Merge branch 'respect_filters' into 'master' 
Fix: User search feature in admin area does not respect filters

https://dev.gitlab.org/gitlab/gitlabhq/issues/2482

See merge request !1155
 2015-08-14 08:35:16 +00:00
Valery Sizov e58e75aa88 Fix: User search feature in admin area does not respect filters 2015-08-13 17:51:20 +03:00
ranjith 22eddffd41 Fixed #9527 2015-08-13 19:48:10 +05:30