summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '7-14-stable-nginx-default' into '7-14-stable' 7-14-stableRémy Coutable2016-10-191-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the file path to a default Nginx file that needs to be deleted for the GitLab web gui to be browsed. Changing it from: `/etc/sites-enabled/default` to `/etc/nginx/sites-enabled/default` ## Are there points in the code the reviewer needs to double check? If we are expecting older versions than Ubuntu 16.04 with Nginx 1.10.0 to be the most common use case for a 7.14 source install, then maybe Nginx used to create this file in the place where the README says and in that case we would leave it. The tests are failing but it can't be because of this change ## Why was this MR needed? When trying to install V7.14 from source on Ubuntu 16.04 with Nginx 1.10.0, the README says to delete a file that exists in a different place from where the README points to. Closes #7 See merge request !6220
| * fix file path7-14-stable-nginx-defaultDe Wet Blomerus2016-09-061-1/+1
|/
* Version 7.14.3v7.14.3Robert Speicher2015-09-101-1/+1
|
* Version 7.14.2v7.14.2Robert Speicher2015-09-091-1/+1
|
* Bump gitlab-shell to v2.6.5Robert Speicher2015-09-084-5/+5
|
* Escape user-provided content in preserved HAML sectionsDouwe Maan2015-09-083-12/+12
|
* Upgrade gitlab_git to 7.2.15 to fix `git blame` errors with ISO-encoded filesStan Hu2015-09-053-3/+4
| | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9577
* Add 7.14.2 CHANGELOG entryRobert Speicher2015-09-051-0/+2
|
* Version 7.14.1v7.14.1Robert Speicher2015-08-251-1/+1
|
* Merge branch 'improve-abuse-reports-stable' into 7-14-stableRobert Speicher2015-08-255-8/+23
|\
| * Merge branch 'improve-abuse-reports' into 'master'improve-abuse-reports-stableDmitriy Zaporozhets2015-08-255-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 viewStan Hu2015-08-254-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) releasedRobert Speicher2015-08-241-1/+1
| | | | [ci skip]
* Fix Error 500 in API when accessing a group that has an avatarStan Hu2015-08-243-1/+4
| | | | Closes #2340
* Only include base URL in OmniAuth full_host parameterStan Hu2015-08-243-10/+23
| | | | Closes #2335
* Version 7.14.0v7.14.0Robert Speicher2015-08-211-1/+1
|
* List the current user first in issuable dropdownsStan Hu2015-08-212-2/+2
|
* Fix bug preventing invite by e-mailStan Hu2015-08-219-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 Maan2015-08-211-2/+8
|
* Version 7.14.0.rc3v7.14.0.rc3Robert Speicher2015-08-211-1/+1
|
* Fix bug where non-project members of the target project could set labels on ↵Douwe Maan2015-08-212-1/+2
| | | | | | new merge requests. (cherry picked from commit 77e508d8fd7a915f5ae221f5e4d6022560398a9e)
* Do not delete the SQL dump too earlyJacob Vosmaer2015-08-211-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 groupingsStan Hu2015-08-203-19/+86
| | | | Closes #2305
* Improved 2FA warning message about lost codesPatricio Cano2015-08-201-1/+3
|
* Version 7.14.0.rc2v7.14.0.rc2Robert Speicher2015-08-191-1/+1
|
* Use File.join instead of Rails.root.join in HelpControllerRobert Speicher2015-08-191-2/+4
|
* Version 7.14.0.rc1v7.14.0.rc1Robert Speicher2015-08-181-1/+1
|
* Merge branch 'fix-authhash-infinite-loop' into 'master'Robert Speicher2015-08-183-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-loopDouwe Maan2015-08-173-20/+31
| |
* | Merge branch 'fix-rake-info' into 'master'Robert Speicher2015-08-181-2/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | Fix gitlab:env:info rake task. Found doing QA. See merge request !1169
| * | Fix gitlab:env:info rake task.fix-rake-infoDouwe Maan2015-08-171-2/+1
| |/
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceStan Hu2015-08-184-1/+21
|\ \
| * \ Merge branch 'mr-source-branch-clear-cache' into 'master'Dmitriy Zaporozhets2015-08-184-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 branchStan Hu2015-08-144-0/+20
| | | | | | | | | | | | | | | | Closes #2272
| * | | Fix incorrect CHANGELOG versionStan Hu2015-08-171-1/+1
| | | |
* | | | Merge pull request #9564 from bbodenmiller/robots.txtStan Hu2015-08-182-1/+63
|\ \ \ \ | | | | | | | | | | disallow irrelevant pages by defaults in robots
| * | | | disallow irrelevant pages by default in robotsBen Bodenmiller2015-08-172-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-4Stan Hu2015-08-182-2/+2
|\ \ \ \ | |/ / / |/| | | capitalize URL in "Home page URL"
| * | | capitalize URL in "Home page URL"Ben Bodenmiller2015-08-172-2/+2
|/ / /
* | | Merge branch 'bump-gitlab-git' into 'master'Stan Hu2015-08-183-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 .gitmodulesStan Hu2015-08-173-3/+4
|/ / / | | | | | | | | | Closes #2262
* | | Merge branch 'rs-remove-gfm_with_options' into 'master'Douwe Maan2015-08-173-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_optionsRobert Speicher2015-08-123-14/+4
| | | | | | | | | | | | | | | | It was redundant because `gfm` also took options.
* | | | Merge branch 'fix-backslashes-inline-diff' into 'master'Douwe Maan2015-08-173-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 droppedStan Hu2015-08-113-2/+45
| | | | | | | | | | | | | | | | | | | | Closes #2253
* | | | | Merge branch 'code-import-error-ui-improvements' into 'master'Douwe Maan2015-08-171-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 importStan Hu2015-08-111-1/+1
| | | | | |
* | | | | | Merge pull request #9565 from gitlabhq/revert-9528-Fixed_alignment_issueDmitriy Zaporozhets2015-08-171-12/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Revert "Fix for #9527"
| * | | | | | Revert "Fix for #9527"Dmitriy Zaporozhets2015-08-171-12/+1
|/ / / / / /
* | | | | | Merge branch 'installation-update-guides' into 'master'Dmitriy Zaporozhets2015-08-173-14/+143
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Installation and update guides for 7.14 cc @rspeicher See merge request !1168