summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* You need to store your DB encryption keydocument-2fa-backupJacob Vosmaer2015-07-212-2/+38
|
* 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
| * | | Fix label read access for unauthenticated usersDaniel Gerhardt2015-07-193-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'rs-issue-2001' into 'master' Valery Sizov2015-07-191-2/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Dynamically check `:admin_*` ability in issuable context Closes #2001 See merge request !1002
| * | | Dynamically check `:admin_*` ability in issuable contextRobert Speicher2015-07-191-2/+2
|/ / / | | | | | | | | | Closes #2001
* | | Merge branch 'fix-mixed-color-preview' into 'master'Valery Sizov2015-07-191-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where notes were being rendered with wrong color preferences due to caching ### What does this MR do? This MR adds the user's color preferences as part of the caching key for notes. ### Why was this MR needed? This should fix a bug introduced via 4d80360b where notes were being loaded from the cache without regard to the current user's color scheme. ### What are the relevant issue numbers? Closes #2008 See merge request !994
| * | | Fix bug where notes were being rendered with wrong color preferences due to ↵Stan Hu2015-07-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | caching Closes #2008
* | | | Merge branch 'fix-oauth-redirection' into 'master'Stan Hu2015-07-192-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix OAuth provider bug where GitLab would not go return to the redirect_uri after sign-in ### What does this MR do? This MR fixes a bug when GitLab is used as an OAuth provider (e.g. to GitLab CI) where the user is not redirected back to the original URI after a successful sign-in. This MR tweaks the Doorkeeper configuration to set the `user_return_to` Devise session variable, as mentioned in this [Stack Overflow](http://stackoverflow.com/questions/14504739/how-to-use-both-devise-and-doorkeeper-gems) post. ### Why was this MR needed? If you attempt to "Login via GitLab" from GitLab CI and aren't logged out completely, GitLab asks for your username and password. After you login, you get directed to the GitLab dashboard instead of back to GitLab CI. It's easy to reproduce: 1. Set up a GitLab CI and GitLab instance (e.g. ci.gitlab.com, gitlab.com). 2. Start an Incognito Window so that you are logged out of GitLab CI and GitLab. 3. Go to the GitLab CI instance. Click the "Login with GitLab". 4. Enter in your credentials. 5. Watch your browser login to GitLab and not return to GitLab CI. ### What are the relevant issue numbers? Closes #1612 See merge request !998
| * | | | Fix OAuth provider bug where GitLab would not go return to the redirect_uri ↵Stan Hu2015-07-182-1/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | after sign-in Closes #1612
* | | | Merge branch 'rs-issue-2013' into 'master' Robert Speicher2015-07-181-3/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show the first tab automatically on MergeRequests#new Closes #2013 See merge request !997
| * | | | Show the first tab automatically on MergeRequests#newrs-issue-2013Robert Speicher2015-07-181-3/+9
|/ / / / | | | | | | | | | | | | Closes #2013
* | | | Merge pull request #9452 from YorickPeterse/masterRobert Speicher2015-07-181-5/+5
|\ \ \ \ | |/ / / |/| | | Only load byebug on MRI
| * | | Only load byebug on MRIYorick Peterse2015-07-181-5/+5
| | | | | | | | | | | | | | | | | | | | This Gem relies on MRI specific debugging APIs. This at least allows installation on Rubinius/JRuby.
* | | | Merge branch 'fix-note-edit-upload-link' into 'master'Stan Hu2015-07-182-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix file upload dialog for comment editing This fixes the file upload dialog which currently works for new comments but not for comment editing. The cause for this is a missing DOM class which causes traversal to the dropzone to fail. This is fixed by adding the expected `gfm-form` class to the edit form. It has to be added dynamically since adding it to the form template would break the form's layout and comment saving. The following screenshot illustrates the issue: ![gitlab-dropzone-upload-dialog-bug](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3a9885c8ba7c07338148ec9e605e5771/gitlab-dropzone-upload-dialog-bug.png) See merge request !956
| * | | | Fix file upload dialog for comment editingDaniel Gerhardt2015-07-172-1/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the file upload dialog which currently works for new comments but not for comment editing. The cause for this is a missing DOM class which causes traversal to the dropzone to fail. This is fixed by adding the expected `gfm-form` class to the edit form. It has to be added dynamically since adding it to the form template would break the form's layout and comment saving.
* | | | Merge branch 'rs-issue-988-test' into 'master' Robert Speicher2015-07-182-1/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add test case for clicking line number anchor icon Follow-up to !988 See merge request !992
| * | | | Add test case for clicking line number anchor iconrs-issue-988-testRobert Speicher2015-07-172-1/+11
|/ / / /
* | | | Merge branch 'fix-line-highlighter-link-click' into 'master'Robert Speicher2015-07-181-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Fix bug where clicking on the link icon on a file would result in "#Lundefined" in the URL Closes #2002 See merge request !988
| * | | Fix bug where clicking on the link icon on a file would result in ↵Stan Hu2015-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | "L#undefined" in the URL Closes #2002
* | | | Merge branch 'add-support-remove-milestone' into 'master'Stan Hu2015-07-178-2/+55
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for destroying project milestones ### What does this MR do? This MR adds a "Remove" button to the project milestones page and the milestone page itself. ### Why was this MR needed? Because lots of people talked about needing to clean their toilets. :) ### What are the relevant issue numbers? Closes https://github.com/gitlabhq/gitlabhq/issues/1504 ### Screenshots ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ef8c7a3ea1db7b37cccae3869ac4de0a/image.png) ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/33eb01c7bc30fb235de96db5efb8746d/image.png) See merge request !980
| * | | | Add support for destroying project milestonesStan Hu2015-07-178-2/+57
| |/ / / | | | | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/1504
* | | | Merge branch 'validate_token_and_url_format_for_gitlab_ci' into 'master' Dmitriy Zaporozhets2015-07-174-4/+47
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Validate format of project_url and token for GitLab CI service. If `project_url` and `token` for are invalid, [service_hook creation](https://gitlab.com/gitlab-org/gitlab-ce/blob/7-13-stable/app/models/project_services/gitlab_ci_service.rb#L30-34) will silently fail due to validation of URL in `WebHook`. Given that token is a sequence of numbers and letters for GitLab CI making sure that there are no unexpected characters should be enough to prevent service_hook being nil. Fixes #1997 See merge request !987
| * | | | Do not disappoint rubocop.validate_token_and_url_format_for_gitlab_ciMarin Jankovski2015-07-171-1/+1
| | | | |
| * | | | Add specs for gitlab ci service validity.Marin Jankovski2015-07-172-0/+39
| | | | |
| * | | | Fix failing specs after adding format verification for token and project url ↵Marin Jankovski2015-07-172-2/+2
| | | | | | | | | | | | | | | | | | | | in gitlab ci service.
| * | | | Validate format of project_url and token for GitLab CI service.Marin Jankovski2015-07-171-2/+6
| | | | |
* | | | | Merge branch 'even-faster-search' into 'master' Dmitriy Zaporozhets2015-07-171-6/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid copy of strings in memory for parsing git grep result Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !967
| * | | | | Avoid copy of strings in memory for parsing git grep resulteven-faster-searchDmitriy Zaporozhets2015-07-131-6/+5
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Update changelogDmitriy Zaporozhets2015-07-171-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-1713-23/+110
|\ \ \ \ \
| * \ \ \ \ Merge branch 'advanced-cache' into 'master' Dmitriy Zaporozhets2015-07-1713-23/+110
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Advanced cache Fixes #1993 * Build missing cache values in background job after each push * Store commit_count in project table. Refresh in background job * moved repository size calculation in background job ## Advantages Every time push is triggered - we build cache for project even without user visiting project page. That means first visit is as fast as others now. This is especially good for active projects where people have some requests fast because of cache and some slow - because cache was build in their request. Between cache expired and cache built we we had gap when Linux repo can give 502 error because calculation commits count takes 30 seconds or even more. Using value from database fix this problem. Before cache is updated you see old value from database. After - you see new one. Basically this merge request is super win to GitLab. We don't do some heavy operations in user request but instead in background job. ## Temporary problem After this migration all projects will have `0` commits in database. It fill be replaced with real value on next push. I did not add recalculation to migration because it will last forever on big instances. Can be fixed by adding rake task which will go in background on live instance without downtime See merge request !986
| | * | | | Avoid cache building for super-weird case when repository root_ref is nilDmitriy Zaporozhets2015-07-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Store commit count in project tableadvanced-cacheDmitriy Zaporozhets2015-07-1711-19/+37
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Build missing cache items in background job after each pushDmitriy Zaporozhets2015-07-175-5/+38
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Add more seed projects. Control amount with SIZE env variableDmitriy Zaporozhets2015-07-171-1/+34
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'release-manager-owns-stable' into 'master' Valery Sizov2015-07-171-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The release manager owns the stable branches I think this helps the release manager because it means they don't have to worry about others pushing commits at the last minute. See merge request !1907
| * | | | | The release manager owns the stable branchesJacob Vosmaer2015-07-171-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | I think this helps the release manager because it means they don't have to worry about others pushing commits at the last minute.
* | | | | Merge branch 'cache-two-weeks' into 'master' Dmitriy Zaporozhets2015-07-172-0/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Expire Rails cache entries after two weeks This should help prevent endless Redis growth. See merge request !1903
| * | | | Expire Rails cache entries after two weeksJacob Vosmaer2015-07-152-0/+4
| | | | | | | | | | | | | | | | | | | | This should help prevent endless Redis growth.
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-172-34/+38
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Clean up editions paragraphSytse Sijbrandij2015-07-171-4/+5
| | | | |
| * | | | Update installation instructions.Sytse Sijbrandij2015-07-171-1/+3
| | | | |
| * | | | Improve the layout of the readme.Sytse Sijbrandij2015-07-171-18/+22
| | | | |
| * | | | Merge branch 'chef-docker' into 'master' Job van der Voort2015-07-161-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added note about chef Added note about chef being required to generate GitLab config. because of tweet https://twitter.com/grahamgilbert/status/621015318442459136 See merge request !982
| | * | | | added additional spacechef-dockerkaren Carias2015-07-151-0/+1
| | | | | |