Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Version 7.14.2v7.14.2 | Robert Speicher | 2015-09-09 | 1 | -1/+1 |
| | |||||
* | Bump gitlab-shell to v2.6.5 | Robert Speicher | 2015-09-08 | 4 | -5/+5 |
| | |||||
* | Escape user-provided content in preserved HAML sections | Douwe Maan | 2015-09-08 | 3 | -12/+12 |
| | |||||
* | Upgrade gitlab_git to 7.2.15 to fix `git blame` errors with ISO-encoded files | Stan Hu | 2015-09-05 | 3 | -3/+4 |
| | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9577 | ||||
* | Add 7.14.2 CHANGELOG entry | Robert Speicher | 2015-09-05 | 1 | -0/+2 |
| | |||||
* | Version 7.14.1v7.14.1 | Robert Speicher | 2015-08-25 | 1 | -1/+1 |
| | |||||
* | Merge branch 'improve-abuse-reports-stable' into 7-14-stable | Robert Speicher | 2015-08-25 | 5 | -8/+23 |
|\ | |||||
| * | Merge branch 'improve-abuse-reports' into 'master'improve-abuse-reports-stable | Dmitriy Zaporozhets | 2015-08-25 | 5 | -8/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | Fix "Reload with full diff" URL button in compare branch view | Stan Hu | 2015-08-25 | 4 | -1/+9 |
|/ | | | | | | 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. | ||||
* | 7.14.1 is (about to be) released | Robert Speicher | 2015-08-24 | 1 | -1/+1 |
| | | | | [ci skip] | ||||
* | Fix Error 500 in API when accessing a group that has an avatar | Stan Hu | 2015-08-24 | 3 | -1/+4 |
| | | | | Closes #2340 | ||||
* | Only include base URL in OmniAuth full_host parameter | Stan Hu | 2015-08-24 | 3 | -10/+23 |
| | | | | Closes #2335 | ||||
* | Version 7.14.0v7.14.0 | Robert Speicher | 2015-08-21 | 1 | -1/+1 |
| | |||||
* | List the current user first in issuable dropdowns | Stan Hu | 2015-08-21 | 2 | -2/+2 |
| | |||||
* | Fix bug preventing invite by e-mail | Stan Hu | 2015-08-21 | 9 | -9/+41 |
| | | | | | | This was broken in 70f5291808 as a result of introducing the ability to filter by current user. Closes #2320 | ||||
* | Check permissions on target project in merge request create service. | Douwe Maan | 2015-08-21 | 1 | -2/+8 |
| | |||||
* | Version 7.14.0.rc3v7.14.0.rc3 | Robert Speicher | 2015-08-21 | 1 | -1/+1 |
| | |||||
* | Fix bug where non-project members of the target project could set labels on ↵ | Douwe Maan | 2015-08-21 | 2 | -1/+2 |
| | | | | | | new merge requests. (cherry picked from commit 77e508d8fd7a915f5ae221f5e4d6022560398a9e) | ||||
* | Do not delete the SQL dump too early | Jacob Vosmaer | 2015-08-21 | 1 | -2/+3 |
| | | | | | | | | | The change in baa157926d432f404a41c31ad6514ff8d5366269 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 . | ||||
* | Fix blame view line groupings | Stan Hu | 2015-08-20 | 3 | -19/+86 |
| | | | | Closes #2305 | ||||
* | Improved 2FA warning message about lost codes | Patricio Cano | 2015-08-20 | 1 | -1/+3 |
| | |||||
* | Version 7.14.0.rc2v7.14.0.rc2 | Robert Speicher | 2015-08-19 | 1 | -1/+1 |
| | |||||
* | Use File.join instead of Rails.root.join in HelpController | Robert Speicher | 2015-08-19 | 1 | -2/+4 |
| | |||||
* | Version 7.14.0.rc1v7.14.0.rc1 | Robert Speicher | 2015-08-18 | 1 | -1/+1 |
| | |||||
* | Merge branch 'fix-authhash-infinite-loop' into 'master' | Robert Speicher | 2015-08-18 | 3 | -20/+31 |
|\ | | | | | | | | | | | Fix infinite loop when SAML was incorrectly configured. See merge request !1170 | ||||
| * | Fix infinite loop when SAML was incorrectly configured.fix-authhash-infinite-loop | Douwe Maan | 2015-08-17 | 3 | -20/+31 |
| | | |||||
* | | Merge branch 'fix-rake-info' into 'master' | Robert Speicher | 2015-08-18 | 1 | -2/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | Fix gitlab:env:info rake task. Found doing QA. See merge request !1169 | ||||
| * | | Fix gitlab:env:info rake task.fix-rake-info | Douwe Maan | 2015-08-17 | 1 | -2/+1 |
| |/ | |||||
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Stan Hu | 2015-08-18 | 4 | -1/+21 |
|\ \ | |||||
| * \ | Merge branch 'mr-source-branch-clear-cache' into 'master' | Dmitriy Zaporozhets | 2015-08-18 | 4 | -0/+20 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear cache to prevent listing deleted branches after MR removes source branch Closes #2272 See merge request !1160 | ||||
| | * | | Clear cache to prevent listing deleted branches after MR removes source branch | Stan Hu | 2015-08-14 | 4 | -0/+20 |
| | | | | | | | | | | | | | | | | Closes #2272 | ||||
| * | | | Fix incorrect CHANGELOG version | Stan Hu | 2015-08-17 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #9564 from bbodenmiller/robots.txt | Stan Hu | 2015-08-18 | 2 | -1/+63 |
|\ \ \ \ | | | | | | | | | | | disallow irrelevant pages by defaults in robots | ||||
| * | | | | disallow irrelevant pages by default in robots | Ben Bodenmiller | 2015-08-17 | 2 | -1/+63 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | Merge pull request #9436 from bbodenmiller/patch-4 | Stan Hu | 2015-08-18 | 2 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | capitalize URL in "Home page URL" | ||||
| * | | | capitalize URL in "Home page URL" | Ben Bodenmiller | 2015-08-17 | 2 | -2/+2 |
|/ / / | |||||
* | | | Merge branch 'bump-gitlab-git' into 'master' | Stan Hu | 2015-08-18 | 3 | -3/+4 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodules Closes #2262 See merge request !1171 | ||||
| * | | | Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodules | Stan Hu | 2015-08-17 | 3 | -3/+4 |
|/ / / | | | | | | | | | | Closes #2262 | ||||
* | | | Merge branch 'rs-remove-gfm_with_options' into 'master' | Douwe Maan | 2015-08-17 | 3 | -14/+4 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the `gfm_with_options` helper It was redundant because `gfm` also took options. See merge request !1152 | ||||
| * | | | Remove the `gfm_with_options` helperrs-remove-gfm_with_options | Robert Speicher | 2015-08-12 | 3 | -14/+4 |
| | | | | | | | | | | | | | | | | It was redundant because `gfm` also took options. | ||||
* | | | | Merge branch 'fix-backslashes-inline-diff' into 'master' | Douwe Maan | 2015-08-17 | 3 | -2/+45 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | | Fix bug where backslashes in inline diffs could be dropped | Stan Hu | 2015-08-11 | 3 | -2/+45 |
| | | | | | | | | | | | | | | | | | | | | Closes #2253 | ||||
* | | | | | Merge branch 'code-import-error-ui-improvements' into 'master' | Douwe Maan | 2015-08-17 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | | | Improve error message display when project fails to import | Stan Hu | 2015-08-11 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #9565 from gitlabhq/revert-9528-Fixed_alignment_issue | Dmitriy Zaporozhets | 2015-08-17 | 1 | -12/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Revert "Fix for #9527" | ||||
| * | | | | | | Revert "Fix for #9527" | Dmitriy Zaporozhets | 2015-08-17 | 1 | -12/+1 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'installation-update-guides' into 'master' | Dmitriy Zaporozhets | 2015-08-17 | 3 | -14/+143 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Installation and update guides for 7.14 cc @rspeicher See merge request !1168 | ||||
| * | | | | | Create update guides for 7.14installation-update-guides | Dmitriy Zaporozhets | 2015-08-17 | 2 | -12/+141 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | Update installation guide with 7.14 | Dmitriy Zaporozhets | 2015-08-17 | 1 | -2/+2 |
|/ / / / / | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | Merge branch 'rs-check-ruby-version' into 'master' | Robert Speicher | 2015-08-16 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Require Ruby 2.1.0 in `gitlab:app:check` task See merge request !1165 |