- 25 Jul, 2015 1 commit
-
-
Stan Hu authored
Fix the "Reload with full diff" URL button On the first load, the merge request tabs would be requested in JSON format to render the HTML. This would cause the "Reload with full diff" button to create a link to `diff.json`. Instead, generate the path in HTML mode. Closes #2041 See merge request !1019
-
- 22 Jul, 2015 1 commit
-
-
Stan Hu authored
On the first load, the merge request tabs would be requested in JSON format to render the HTML. This would cause the "Reload with full diff" button to create a link to diff.json. Closes #2041
-
- 24 Jul, 2015 3 commits
-
-
Valery Sizov authored
Fix error 500 when no HEAD is available Steps to reproduce: 1. Create a project with a README 2. In the actual remote, type: `git symbolic-ref HEAD refs/heads/nowhere` 3. Check that HEAD is gone via `git ls-remote .` 4. Go to the projects page and see the Error 500 Error: ``` NoMethodError - undefined method `sha' for nil:NilClass: app/helpers/projects_helper.rb:281:in `readme_cache_key' app/views/projects/_readme.html.haml:10:in `_app_views_projects__readme_html_haml___2036282917939462960_70154565285700' actionview (4.1.11) lib/action_view/template.rb:145:in `block in render' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `block in instrument' activesupport (4.1.11) lib/active_support/notifications/instrumenter.rb:20:in `instrument' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `instrument' actionview (4.1.11) lib/action_view/template.rb:339:in `instrument' actionview (4.1.11) lib/action_view/template.rb:143:in `render' rack-mini-profiler (0.9.0) lib/mini_profiler/profiling_methods.rb:108:in `block in profile_method' actionview (4.1.11) lib/action_view/renderer/partial_renderer.rb:306:in `render_partial' actionview (4.1.11) lib/action_view/renderer/partial_renderer.rb:279:in `block in render' actionview (4.1.11) lib/action_view/renderer/abstract_renderer.rb:38:in `block in instrument' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `block in instrument' activesupport (4.1.11) lib/active_support/notifications/instrumenter.rb:20:in `instrument' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `instrument' actionview (4.1.11) lib/action_view/renderer/abstract_renderer.rb:38:in `instrument' actionview (4.1.11) lib/action_view/renderer/partial_renderer.rb:278:in `render' actionview (4.1.11) lib/action_view/renderer/renderer.rb:47:in `render_partial' actionview (4.1.11) lib/action_view/helpers/rendering_helper.rb:35:in `render' haml (4.0.5) lib/haml/helpers/action_view_mods.rb:10:in `block in render_with_haml' haml (4.0.5) lib/haml/helpers.rb:89:in `non_haml' haml (4.0.5) lib/haml/helpers/action_view_mods.rb:10:in `render_with_haml' app/views/projects/show.html.haml:47:in `_app_views_projects_show_html_haml__1458303859692972698_70154948164180' actionview (4.1.11) lib/action_view/template.rb:145:in `block in render' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `block in instrument' ``` Closes https://github.com/gitlabhq/gitlabhq/issues/9484, but there may be some other issue there. See merge request !1041
-
Stan Hu authored
Steps to reproduce: 1. Create a project with a README 2. In the actual remote, type: `git symbolic-ref HEAD refs/heads/nowhere` 3. Check that HEAD is gone via `git ls-remote .` 4. Go to the projects page and see the Error 500 Closes https://github.com/gitlabhq/gitlabhq/issues/9484
-
Valery Sizov authored
Allow custom label to be set for authentication providers. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2341 Beside the above, I've: - Refactored `OauthHelper` to have clearer method names and behaviour - Moved some of `OauthHelper` behaviour to `Gitlab::OAuth::Provider` - Renamed `OauthHelper` to `AuthHelper` since LDAP, SAML, Kerberos aren't OAuth - Updated the icons for GitHub and GitLab In the examples below, "OurAuth" is a SAML provider with a custom label.     See merge request !927
-
- 02 Jul, 2015 1 commit
-
-
Douwe Maan authored
-
- 23 Jul, 2015 3 commits
-
-
Valery Sizov authored
-
Valery Sizov authored
-
Valery Sizov authored
Fix bug causing "Remove source-branch" option not to work for merge requests from the same project. Fixes #2049. See merge request !1025
-
- 22 Jul, 2015 5 commits
-
-
Douwe Maan authored
-
Valery Sizov authored
-
Valery Sizov authored
-
Stan Hu authored
-
Stan Hu authored
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
-
- 20 Jul, 2015 1 commit
-
-
Stan Hu authored
Closes #1362
-
- 21 Jul, 2015 2 commits
-
-
Daniel Gerhardt authored
ZenMode is now initialized for snippet pages. Fixes #2036.
-
Valery Sizov authored
-
- 20 Jul, 2015 2 commits
-
-
Daniel Gerhardt authored
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]
-
Stan Hu authored
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
-
- 19 Jul, 2015 1 commit
-
-
Daniel Gerhardt authored
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.
-
- 20 Jul, 2015 1 commit
-
-
Stan Hu authored
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:  See merge request !678
-
- 19 Mar, 2015 1 commit
-
-
Ben Boeckel authored
-
- 20 Jul, 2015 3 commits
-
-
Valery Sizov authored
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
-
Stan Hu authored
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
-
Marin Jankovski authored
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
-
- 17 Jul, 2015 1 commit
-
-
Stan Hu authored
Closes #1967
-
- 19 Jul, 2015 1 commit
-
-
Daniel Gerhardt authored
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.
-
- 18 Jul, 2015 1 commit
-
-
Stan Hu authored
Closes #1612
-
- 10 Jul, 2015 1 commit
-
-
Daniel Gerhardt authored
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.
-
- 17 Jul, 2015 1 commit
-
-
Stan Hu authored
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   See merge request !980
-
- 14 Jul, 2015 1 commit
-
-
Stan Hu authored
Closes https://github.com/gitlabhq/gitlabhq/issues/1504
-
- 17 Jul, 2015 1 commit
-
-
Dmitriy Zaporozhets authored
Signed-off-by:
Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
- 15 Jul, 2015 1 commit
-
-
Jacob Vosmaer authored
This should help prevent endless Redis growth.
-
- 14 Jul, 2015 1 commit
-
-
Sytse Sijbrandij authored
-
- 13 Jul, 2015 1 commit
-
-
Dmitriy Zaporozhets authored
Add error message for SSH key linebreaks Solves this [request](http://feedback.gitlab.com/forums/176466-general/suggestions/5653544-check-for-linebreaks-in-ssh-key). See merge request !672
-
- 11 Jul, 2015 1 commit
-
-
Nikita Verkhovin authored
-
- 13 Jul, 2015 1 commit
-
-
Dmitriy Zaporozhets authored
Allow admins to disable 2FA for a user >  Depends on !961 See merge request !962
-
- 10 Jul, 2015 1 commit
-
-
Robert Speicher authored
-
- 13 Jul, 2015 1 commit
-
-
Dmitriy Zaporozhets authored
Fix transferring of project to another group using the API. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2397. See merge request !926
-
- 02 Jul, 2015 1 commit
-
-
Douwe Maan authored
-