Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add a `program` tag to Sentry Raven contextrs-sidekiq-sentry-context | Robert Speicher | 2016-04-09 | 1 | -0/+10 |
| | | | | | | | | | This will let us filter errors by the program environment in which they were encountered. Source: http://stackoverflow.com/a/28370539/223897 Closes #15092 | ||||
* | Merge branch 'master' into issue_12658 | Douwe Maan | 2016-03-21 | 1 | -2/+0 |
|\ | | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb # app/views/projects/_home_panel.html.haml # app/views/shared/projects/_project.html.haml # db/schema.rb # spec/models/project_spec.rb | ||||
| * | Use the configured Kaminari "per page" defaultrs-use-kaminari-default | Robert Speicher | 2016-03-19 | 1 | -2/+0 |
| | | |||||
* | | Tweaks, refactoring, and specs | Douwe Maan | 2016-03-20 | 1 | -61/+0 |
|/ | |||||
* | Move method to User | Jacob Vosmaer | 2016-03-10 | 1 | -1/+1 |
| | |||||
* | Rename ExpiringLock to ExclusiveLease | Jacob Vosmaer | 2016-03-10 | 1 | -1/+1 |
| | |||||
* | Acquire lock before LDAP sync | Jacob Vosmaer | 2016-03-09 | 1 | -0/+2 |
| | |||||
* | Fix build and add specs | Rubén Dávila | 2016-02-19 | 1 | -1/+8 |
| | |||||
* | Provide explicit html format when rendering git_not_found pagers-git_not_found | Robert Speicher | 2016-02-15 | 1 | -1/+1 |
| | | | | | Prior, if the request format was, for example, .zip, we'd get an `ActionView::MissingTemplate` error. | ||||
* | Properly render the `errors/git_not_found` page | Robert Speicher | 2016-02-15 | 1 | -1/+1 |
| | |||||
* | Various filter fixes | Josh Frye | 2016-02-04 | 1 | -2/+2 |
| | |||||
* | Paginate + ajax filter dashboard projects | Josh Frye | 2016-02-04 | 1 | -2/+3 |
| | |||||
* | Support download access by PRIVATE-TOKEN header | Stan Hu | 2016-02-03 | 1 | -0/+2 |
| | | | | | | | | | Currently there is no way to download a raw file without embedding the token in the URL, which exposes the token in the URL. There should be an way of sending this information via the header as the API does. Closes https://github.com/gitlabhq/gitlabhq/issues/8137 | ||||
* | Make default sorting preference work for Issues and MRs.issue_5546 | Rubén Dávila | 2016-01-22 | 1 | -4/+2 |
| | |||||
* | Merge branch 'master' into issue_5546 | Rubén Dávila | 2016-01-22 | 1 | -0/+1 |
|\ | |||||
| * | Merge branch 'master' into issue_3945 | Douwe Maan | 2016-01-20 | 1 | -0/+11 |
| |\ | |||||
| * \ | Merge branch 'master' into issue_3945 | Douwe Maan | 2016-01-20 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into issue_3945 | Rubén Dávila | 2016-01-14 | 1 | -1/+1 |
| |\ \ \ | |||||
| * | | | | Change strategy to highlight diffs. #3945 | Rubén Dávila | 2016-01-07 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Now we apply syntax highlighting to the whole old and new files. This basically help us to highlight adequately multiline content. | ||||
* | | | | | Make sorting preference reusable for all projects. | Rubén Dávila | 2016-01-22 | 1 | -6/+15 |
| | | | | | |||||
* | | | | | Make cookie suffix more simpler. | Rubén Dávila | 2016-01-21 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Little refactor plus some specs. | Rubén Dávila | 2016-01-21 | 1 | -12/+6 |
| | | | | | |||||
* | | | | | Remember last sort option used. | Rubén Dávila | 2016-01-20 | 1 | -1/+21 |
| |_|_|/ |/| | | | |||||
* | | | | Send user context to Sentry | Douwe Maan | 2016-01-20 | 1 | -0/+11 |
| |_|/ |/| | | |||||
* | | | Consider that URL can end with '/' before redirecting. #7975issue_7975 | Rubén Dávila | 2016-01-13 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Sort by ID when sorting using "Recently created" | Yorick Peterse | 2016-01-07 | 1 | -1/+1 |
|/ | | | | | | | | | Sorting by "id" has the same effect as sorting by created_at while performing far better and without the need of an extra index (in case one wanted to speed up sorting by "created_at"). Sorting by "Recently updated" still uses the physical "updated_at" column as there's no way to use the "id" column for this instead. | ||||
* | Fixed codestyle and added 2FA documentationfeature/force-tfa | Gabriel Mazetto | 2015-12-24 | 1 | -2/+2 |
| | |||||
* | specs for forced two-factor authentication and grace period | Gabriel Mazetto | 2015-12-24 | 1 | -7/+3 |
| | | | | simplified code and fixed stuffs | ||||
* | Grace period support for TFA | Gabriel Mazetto | 2015-12-24 | 1 | -2/+18 |
| | |||||
* | WIP require two factor authentication | Gabriel Mazetto | 2015-12-24 | 1 | -0/+12 |
| | |||||
* | add CAS authentication support | tduehr | 2015-12-14 | 1 | -0/+15 |
| | |||||
* | Only redirect to homepage url when its not the root url | Jeroen van Baarsen | 2015-11-02 | 1 | -7/+15 |
| | | | | | | | | | | | It was possible to create an infi redirect when the user set up the `home_page_url` to redirect to the main URL of the gitlab instance. This fix makes sure this redirect is not possible. Fixes !1020 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | ||||
* | Merge branch 'project-path-case-sensitivity' into 'master' | Robert Speicher | 2015-10-22 | 1 | -1/+0 |
|\ | | | | | | | | | | | | | Prefer project with exact path to differently cased one when both exist. Fixes #3113. See merge request !1649 | ||||
| * | Move case sensitivity check to find_with_namespace. | Douwe Maan | 2015-10-21 | 1 | -2/+1 |
| | | |||||
| * | Prefer project with exact path to differently cased one when both exist. | Douwe Maan | 2015-10-20 | 1 | -2/+2 |
| | | |||||
* | | Redirect to a default path if HTTP_REFERER is not set | Stan Hu | 2015-10-20 | 1 | -0/+4 |
|/ | | | | | | | | | | Safari 9.0 does not yet honor the HTML5 `origin-when-cross-origin` mode, and it's possible load balancers/proxies strip the HTTP_REFERER from the request header. In these cases, default to some default path. Closes #3122 Closes https://github.com/gitlabhq/gitlabhq/issues/9731 | ||||
* | Merge branch 'master' into git-archive-golanggit-archive-golang | Douwe Maan | 2015-10-15 | 1 | -5/+1 |
|\ | |||||
| * | Only render 404 page from /publicinified_404_error | Valery Sizov | 2015-10-13 | 1 | -5/+1 |
| | | |||||
* | | Always return HTML in git_not_found | Jacob Vosmaer | 2015-10-14 | 1 | -1/+1 |
|/ | | | | This allows us to give a nice 404 for e.g. archive.zip. | ||||
* | Redirect case sensitive project path to the normalized one | Francesco Levorato | 2015-09-18 | 1 | -1/+6 |
| | |||||
* | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | Dmitriy Zaporozhets | 2015-09-09 | 1 | -5/+11 |
|\ | |||||
| * | FogBugz project import | Jared Szechy | 2015-09-08 | 1 | -1/+6 |
| | | |||||
| * | Merge branch 'rs-remove-user-color-scheme-class' into 'master' | Douwe Maan | 2015-08-27 | 1 | -4/+5 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply syntax highlighting to fenced code blocks client-side Instead of applying the syntax highlighting scheme class to these blocks server-side, we use Javascript and Gon to apply the user's color scheme (or the default) client-side. This will make it easier to cache these blocks in the future because they're no longer state-dependent. See merge request !1203 | ||||
| | * | Remove user_color_scheme_class | Robert Speicher | 2015-08-25 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of rendering this value server-side, we use Javascript and Gon to apply the user's color scheme (or the default) to any syntax highlighted code blocks. This will make it easier to cache these blocks in the future because they're no longer state-dependent. | ||||
* | | | Move helpers back to original directory | Dmitriy Zaporozhets | 2015-09-09 | 1 | -6/+2 |
| | | | |||||
* | | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | Douwe Maan | 2015-08-26 | 1 | -1/+3 |
|\ \ \ | |/ / | |||||
| * | | Prevent too many redirects error when home page URL set to external_urll | Stan Hu | 2015-08-26 | 1 | -1/+3 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many users naively set the home page URL setting to external_url (e.g. https://mydomain.com). When an unauthenticated user signs in, this causes endless redirections. For example, this is occuring: 1. Unauthenticated user attempts to access https://mydomain.com/dashboard 2. Application redirects to the home page URL: https://mydomain.com 3. Repeat step 2 In step 3, ApplicationController should have redirected the user to https://mydomain.com/users/sign_in. Disabling the redirection if home page URL is the same as external_url prevents users from messing up. Closes https://github.com/gitlabhq/gitlabhq/issues/8843 Closes #2057 | ||||
* | | Groundwork for merging CI into CE | Douwe Maan | 2015-08-25 | 1 | -5/+6 |
|/ | |||||
* | Import sources: show only enabled sources | Artem Sidorenko | 2015-08-20 | 1 | -1/+29 |
| | |||||
* | Allow custom label to be set for authentication providers.auth-icons-labels | Douwe Maan | 2015-07-23 | 1 | -3/+3 |
| |