home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 00:56:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,273 Commits 48 Branches 340 Tags
41a2fd7cd6207ff0fcafc6e93a48dca024f77607
Commit Graph
18273 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Douwe MaanandRobert Speicher 41a2fd7cd6 Escape user-provided content in preserved HAML sections 2015-09-08 13:19:17 -04:00
Stan HuandRobert Speicher 348b983a53 Upgrade gitlab_git to 7.2.15 to fix git blame errors with ISO-encoded files 
Closes https://github.com/gitlabhq/gitlabhq/issues/9577
 2015-09-05 17:57:39 -04:00
Robert Speicher cdee3ab97d Add 7.14.2 CHANGELOG entry 2015-09-05 17:57:11 -04:00
Robert Speicher 481c966d28 Version 7.14.1 v7.14.1 2015-08-25 10:05:40 -07:00
Robert Speicher 57ee993f20 Merge branch 'improve-abuse-reports-stable' into 7-14-stable 2015-08-25 09:22:34 -07:00
Stan HuandRobert Speicher e8329f0db6 Fix "Reload with full diff" URL button in compare branch view 
This button worked when viewing merge requests because the JavaScript
stripped the .html in the Ajax request. However, it left the .html suffix
in the compare branch view.
 2015-08-25 09:20:20 -07:00
Dmitriy Zaporozhets 3052e6f608 Merge branch 'improve-abuse-reports' into 'master' 
Improve abuse reports management

* Link to user profile instead of user admin page
* One button for remove user and report
* Remove user and report without page reloading

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

See merge request !1196
 2015-08-25 12:37:02 +02:00
Robert Speicher c935deeb2d 7.14.1 is (about to be) released 
[ci skip]
 2015-08-24 15:43:46 -07:00
Stan HuandRobert Speicher 6652fac234 Fix Error 500 in API when accessing a group that has an avatar 
Closes #2340
 2015-08-24 12:25:41 -07:00
Stan HuandRobert Speicher 683f77bc5a Only include base URL in OmniAuth full_host parameter 
Closes #2335
 2015-08-24 12:23:56 -07:00
Robert Speicher 6efd0bc1e2 Version 7.14.0 v7.14.0 2015-08-21 21:23:08 -07:00
Stan HuandRobert Speicher 27e2749175 List the current user first in issuable dropdowns 2015-08-21 16:19:29 -07:00
Stan HuandRobert Speicher 3f3f07ef4d Fix bug preventing invite by e-mail 
This was broken in 70f5291808 as a result of introducing the ability to filter by current user.

Closes #2320
 2015-08-21 16:19:25 -07:00
Douwe MaanandRobert Speicher 4ed89992f3 Check permissions on target project in merge request create service. 2015-08-21 11:03:23 -07:00
Robert Speicher db4d828e75 Version 7.14.0.rc3 v7.14.0.rc3 2015-08-21 10:37:21 -07:00
Douwe MaanandRobert Speicher 032d2442b1 Fix bug where non-project members of the target project could set labels on new merge requests. 
(cherry picked from commit 77e508d8fd)
 2015-08-21 09:38:38 -07:00
Jacob VosmaerandRobert Speicher 06160cfda6 Do not delete the SQL dump too early 
The change in baa157926d broke backup
restore fucnctionality. This would not lead to data loss, but it
prevented the restore script from working. This bug exists only in
7.14.0 release candidate versions, not in 7.13.

Reported in https://github.com/gitlabhq/gitlabhq/issues/9571 .
 2015-08-21 09:10:59 -07:00
Stan HuandRobert Speicher 31e897ccef Fix blame view line groupings 
Closes #2305
 2015-08-20 14:27:06 -07:00
Patricio CanoandRobert Speicher f18e338672 Improved 2FA warning message about lost codes 2015-08-20 13:35:30 -07:00
Robert Speicher 52c3894f3d Version 7.14.0.rc2 v7.14.0.rc2 2015-08-19 16:37:30 -07:00
Robert Speicher 980a33552e Use File.join instead of Rails.root.join in HelpController 2015-08-19 09:34:17 -07:00
Robert Speicher 2941cbb897 Version 7.14.0.rc1 v7.14.0.rc1 2015-08-18 09:20:42 -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