summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Stricter mkdir's in 'rake gitlab:backup:create'backup-directory-permissionsJacob Vosmaer2015-07-303-4/+14
|
* Set internal backup directory modes on createJacob Vosmaer2015-07-294-5/+3
| | | | This sidesteps problems with running 'chmod' on some CIFS mounts.
* Merge branch 'add-file' into 'master' Job van der Voort2015-07-282-1/+34
|\ | | | | | | | | | | | | New document in GitLab Basics about adding new files See merge request !1913
| * fixed details in documentkaren Carias2015-07-271-2/+2
| |
| * added new document about adding new fileskaren Carias2015-07-232-1/+34
| |
* | Merge branch 'doc-size' into 'master' Job van der Voort2015-07-281-1/+4
|\ \ | | | | | | | | | | | | | | | | | | Added info about repo size Because of tweet https://twitter.com/s_hulard/status/624160758335672320 See merge request !1912
| * | fixed textkaren Carias2015-07-271-1/+2
| | |
| * | added info about repo sizekaren Carias2015-07-231-1/+3
| |/
* | Merge branch 'unique-ssh' into 'master' Job van der Voort2015-07-271-0/+3
|\ \ | | | | | | | | | | | | | | | | | | Added note about SSH keys being unique Because of issue https://gitlab.com/gitlab-com/support-forum/issues/143 See merge request !1914
| * | added note about unique SSH keyskaren Carias2015-07-241-0/+3
|/ /
* | Merge branch 'labels-mr' into 'master' Job van der Voort2015-07-241-1/+3
|\ \ | |/ |/| | | | | | | | | Added note about labels in MR because of tweet https://twitter.com/apoirier1/status/624197308759035905 See merge request !1911
| * added note about labels in MRkaren Carias2015-07-231-1/+3
|/
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-07-228-12/+86
|\
| * Merge branch 'fix-cache-clear-test-issue' into 'master'Stan Hu2015-07-221-6/+2
| |\ | | | | | | | | | | | | | | | | | | | | | Use project repository expire_cache to clear cache in test Clearing the entire Redis cache in 643557d for the `branches_spec.rb` may be causing issues. Just clear what we need. See merge request !1022
| | * Clearing the entire Redis cache may be too expensive; just useStan Hu2015-07-211-6/+2
| |/ | | | | | | the repository expire_cache method
| * Merge branch 'fix-dup-changelog-entry' into 'master'Stan Hu2015-07-221-2/+1
| |\ | | | | | | | | | | | | | | | Remove 7.14 entry that was pushed to 7.13 See merge request !1020
| | * Remove 7.14 entry that was pushed to 7.13Stan Hu2015-07-211-2/+1
| |/
| * Merge branch 'fix-404-empty-repo' into 'master'Stan Hu2015-07-225-8/+47
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 404 error in files view after deleting the last file in a repository Here's the logic: 1. In `TreeController`, `require_non_empty_project` will prevent `show` from being called if the project is empty. That means all calls to `show` will be guaranteed to have at least 1 commit. 2. If the ref name is not valid, then return a 404. This ensures that at least the controller is looking at a valid branch/tag/SHA ID. 3. This leaves a number of cases: ``` 3a. Valid ref, valid directory 3b. Valid ref, valid filename 3c. Valid ref, invalid path 3d. Valid ref, no files ``` Case 3a: The tree will not be `empty?` and will pass through the whole function. Case 3b: The tree will be `empty?` but the `blob_at` will resolve properly and trigger a redirect to the file. Case 3c: In this case, a path is given. Return 404 if it cannot be resolved neither as a tree nor a blob. Case 3d: In this case, no path is given. If the tree is empty, this means it's an empty branch and just fall through. Example broken branch: https://gitlab.com/gitlab-org/gitlab-test/tree/empty-branch Closes #1362 See merge request !1010
| | * Fix 404 error in files view after deleting the last file in a repositoryStan Hu2015-07-215-8/+46
| | | | | | | | | | | | Closes #1362
| * | Merge branch 'fix-snippet-note-fullscreen' into 'master'Hannes Rosenögger2015-07-212-1/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix full screen mode for snippet comments ZenMode is now initialized for snippet pages. Fixes #2036. See merge request !1016
| | * | Fix full screen mode for snippet commentsDaniel Gerhardt2015-07-212-1/+5
| |/ / | | | | | | | | | | | | | | | ZenMode is now initialized for snippet pages. Fixes #2036.
| * | Merge branch 'document-2fa-backup' into 'master' Valery Sizov2015-07-212-2/+38
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | You need to store your DB encryption key You can break two-factor authentication for existing users when restoring a backup if you lost your DB encryption key. See merge request !1015
| | * | You need to store your DB encryption keydocument-2fa-backupJacob Vosmaer2015-07-212-2/+38
| | | |
| * | | Merge branch 'changelog_update' into 'master' Valery Sizov2015-07-211-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update changelog See merge request !1013
| | * | | Update changelogchangelog_updateValery Sizov2015-07-211-2/+2
| |/ / /
* | | | Merge branch 'fork-project' into 'master' Job van der Voort2015-07-223-1/+23
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Added Fork Project document to GitLab Basics See merge request !1909
| * | | fixed imagekaren Carias2015-07-211-1/+1
| | | |
| * | | added Fork Project documentkaren Carias2015-07-213-1/+23
|/ / /
* | | Merge branch 'overwrite-during-backup' into 'master' Valery Sizov2015-07-211-0/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | Don't stop if database.sql.gz already exists The existing behavior of the backups is to overwrite whatever data was still there in the scratch directories. This broke when we added a 'gzip' step because 'gzip database.sql' will fail if 'database.sql.gz' already exists. Doing 'rm -f database.sql.gz' before the 'gzip' avoids this failure. See merge request !1011
| * | Don't stop if database.sql.gz already existsoverwrite-during-backupJacob Vosmaer2015-07-211-0/+1
|/ / | | | | | | | | | | | | | | The existing behavior of the backups is to overwrite whatever data was still there in the scratch directories. This broke when we added a 'gzip' step because 'gzip database.sql' will fail if 'database.sql.gz' already exists. Doing 'rm -f database.sql.gz' before the 'gzip' avoids this failure.
* | Merge branch 'fix-changelog-7.11-7.12' into 'master'Robert Schilling2015-07-201-3/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix change log for 7.11 and move entry to 7.12 The change log for 7.11 was accidentally split in 3865a1d92585cb31864b5d0f1b325c3585b5c681. Additionally, the change added with this commit did not make it into 7.11 according to `git branch --contains` and it has not been cherry picked to 7-11-stable so the entry is moved to 7.12. Refs GH-5625, GH-9318. See merge request !1009
| * | Fix change log for 7.11 and move entry to 7.12Daniel Gerhardt2015-07-201-3/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | The change log for 7.11 was accidentally split in 3865a1d92585cb31864b5d0f1b325c3585b5c681. Additionally, the change added with this commit did not make it into 7.11 according to `git branch --contains` and it has not been cherry picked to 7-11-stable so the entry is moved to 7.12. Refs GH-5625, GH-9318. [ci skip]
* | Merge branch 'gc-images-no-casing' into 'master'Stan Hu2015-07-203-1/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | GoogleCode importer: Do not care about casing of image file extensions When a GoogleCode repository contains an attached image with an UPPERCASE file extension, it's not inlined. /CC @DouweM See merge request !1003
| * | GoogleCode importer: Do not care about casing of image file extensionsSven Strickroth2015-07-203-1/+7
| | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | | Merge branch 'fix-disabled-feature-access' into 'master'Stan Hu2015-07-202-23/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix (i.e. prevent) access to disabled features for unauthenticated users Unauthenticated users had access to disabled features of public projects. The code has been slightly refactored so that feature checks are done in a separate method and can also be applied for public access. See merge request !1006
| * | | Fix access to disabled features for unauthenticated usersDaniel Gerhardt2015-07-202-23/+32
| | | | | | | | | | | | | | | | | | | | | | | | Unauthenticated users had access to disabled features of public projects. The code has been slightly refactored so that feature checks are done in a separate method and can also be applied for public access.
* | | | Merge branch 'mr-fetch-command' into 'master'Stan Hu2015-07-202-0/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge_requests: add fetch command to the MR page In our instance, users asked for an easy way to get the contents of the MR into their local clone. This adds a command line which can be used to fetch the contents of the MR. Screenshot: ![fetch-command](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d83acfbdb69f023d13b45dff5d583ac1/fetch-command.png) See merge request !678
| * | | | merge_requests: add fetch command to the MR pageBen Boeckel2015-07-202-0/+11
| | |_|/ | |/| |
* | | | Merge branch 'fix-slow-repository-cache-update' into 'master'Valery Sizov2015-07-202-19/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove repository graph log to fix slow cache updates after push event Recalculating `graph_log` took minutes on a large repository since each of the 6000 commits would need to calculate the diff. Since graph_log does not appear to be used, remove it from the list of things to update. For the Linux kernel repository, this reduced the `ProjectCacheWorker` time from 8+ minutes to 16 seconds. Closes #2016 See merge request !1005
| * | | | Remove repository graph log to fix slow cache updates after push eventStan Hu2015-07-192-19/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recalculating graph_log took minutes on a large repository since each of the 6000 commits would need to calculate the diff. Since graph_log does not appear to be used, remove it from the list of things to update. For the Linux kernel repository, this reduced the ProjectCacheWorker time from 8+ minutes to 16 seconds. Closes #2016
* | | | | Merge branch 'remove-redundant-last-push' into 'master'Valery Sizov2015-07-201-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove redundant last push event if activity feed is set to main page ### What does this MR do? This MR eliminates a redundant last push event message if the user's preferences are set to the main activity feed. ### Why was this MR needed? Lots of wasted space was introduced as a result. ### Screenshots #### Before ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/e7fdeb58b2017ec45443bf0d54a94685/image.png) #### After ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/d4a15113127be119e7c33ff501020f16/image.png) ### What are the relevant issue numbers? Closes #2009 See merge request !995
| * | | | | Remove redundant last push event if activity feed is set to main pageStan Hu2015-07-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Closes #2009
* | | | | | Merge branch 'activity_publicly_accessible' into 'master' Valery Sizov2015-07-201-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Public project activity page asks for sign-in https://gitlab.com/gitlab-org/gitlab-ce/issues/2021 See merge request !1007
| * | | | | Public project activity page asks for sign-inactivity_publicly_accessibleValery Sizov2015-07-201-1/+1
| | | | | |
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2015-07-201-1/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #9400 from tuxillo/patch-1Jacob Vosmaer2015-07-201-1/+1
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | Use whoami instead of $USER
| | * | | | | Use whoami instead of $USERAntonio Huete Jimenez2015-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | - Use whoami instead of relying on the existence of $USER enviroment variable which is not always present
* | | | | | | Merge branch 'set-omniauth-full-host' into 'master'Marin Jankovski2015-07-202-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set OmniAuth full_host parameter to ensure redirect URIs are correct ### What does this MR do? This MR sets the OmniAuth `full_host` parameter to the configured GitLab URL to ensure the `redirect_uri` parameter is called with the right GitLab host. ### Why was this MR needed? [OmniAuth attempts to grab the request URI](http://awesomeprogrammer.com/blog/2012/12/09/dealing-with-omniauth-redirect-uri-mismatch-invalid-port-number-gotcha/) and use that. If you set up a reverse proxy that terminates SSL at the Web server layer (e.g. https://gitlab.domain.com), omniauth will use the internal URL (e.g. http://my-host:8080) in its redirect URI unless all the Web server headers are properly set (e.g. `X-Forwarded-Port`, etc.). This is easy to forget or mess up, and it's better to ensure that OmniAuth has the right value from the start. ### What are the relevant issue numbers? Closes #1967 See merge request !991
| * | | | | | Set OmniAuth full_host parameter to ensure redirect URIs are correctStan Hu2015-07-172-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #1967
* | | | | | | Merge branch 'fix-unauthenticated-label-access' into 'master'Stan Hu2015-07-203-1/+7
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix label read access for unauthenticated users The label page was added to navigation for unauthorized users because the previously used milestone read permission was still checked. This has been fixed and read access to labels is now granted (again) for public projects. This regression has been introduced in 07efb17e10fe26a01b60d8441868f9fbda0768f2 (7.12). See also 9bcd36396b9b71467f66dd4ed79ab709bb5d027a. Refs !836, !842. See merge request !1000