Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into bvl-group-trees | Bob Van Landuyt | 2017-10-10 | 1 | -0/+3 |
|\ | |||||
| * | Create idea of read-only databasetc-geo-read-only-idea | Toon Claes | 2017-10-06 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | In GitLab EE, a GitLab instance can be read-only (e.g. when it's a Geo secondary node). But in GitLab CE it also might be useful to have the "read-only" idea around. So port it back to GitLab CE. Also having the principle of read-only in GitLab CE would hopefully lead to less errors introduced, doing write operations when there aren't allowed for read-only calls. Closes gitlab-org/gitlab-ce#37534. | ||||
* | | Add a `WithPagination` concern to reuse across serializers | Bob Van Landuyt | 2017-10-04 | 1 | -0/+1 |
|/ | |||||
* | Load only the currently needed JS locale file | Tim Zallmann | 2017-10-04 | 1 | -0/+1 |
| | |||||
* | Move new nav into main CSS folder | Annabel Dunstone Gray | 2017-09-25 | 1 | -2/+0 |
| | |||||
* | Expand filtered parameters to include `token`sh-filter-runner-token | Stan Hu | 2017-09-10 | 1 | -2/+2 |
| | | | | | Now that we are logging API requests in `api_json.log`, we see that the runner token was not filtered properly. | ||||
* | Filter additional secrets from Rails logs | Stan Hu | 2017-08-30 | 1 | -11/+4 |
| | | | | | | | | | | | | | | Upon inspection of logs, there were a number of fields not filtered. For example: * authenticity_token: CSRF token * rss_token: Used for RSS feeds * secret: Used with Projects::UploadController Rails provides a way to match regexps, so we now filter: * Any parameter ending with `_token` * Any parameter containing `password` * Any parameter containing `secret` | ||||
* | Re-enable SqlInjection and CommandInjection | Brian Neel | 2017-08-08 | 1 | -1/+1 |
| | |||||
* | Support references to group milestones | Sean McGivern | 2017-08-07 | 1 | -0/+4 |
| | | | | | Group milestones can only be referred to by name, not IID. They also do not support cross-project references. | ||||
* | Backport to CE for:2902-standalone-ee-dir-ce | Lin Jen-Shin | 2017-08-04 | 1 | -2/+2 |
| | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2483 | ||||
* | Support multiple Redis instances based on queue type | Paul Charlton | 2017-07-11 | 1 | -8/+10 |
| | |||||
* | Merge branch 'feature/user-datetime-search-api-mysql' into 'master' | Douwe Maan | 2017-07-07 | 1 | -1/+2 |
|\ | | | | | | | | | | | | | Add creation time filters to user search API for admins Closes #29507 See merge request !12682 | ||||
| * | move CreatedAtFilter to concerns folder | James Lopez | 2017-07-07 | 1 | -1/+2 |
| | | |||||
* | | Include new URL helpers retroactively into includers of Gitlab::Routingdm-fix-project-path-helpers-production | Douwe Maan | 2017-07-07 | 1 | -10/+4 |
|/ | |||||
* | Merge branch 'fix-routes-in-production-mode' into 'master' | Douwe Maan | 2017-07-06 | 1 | -1/+5 |
|\ | | | | | | | | | | | | | Fix shorter route helpers in production environment Closes #34741 See merge request !12675 | ||||
| * | Fix shorter route helpers in production environmentfix-routes-in-production-mode | Sean McGivern | 2017-07-06 | 1 | -1/+5 |
| | | | | | | | | | | | | I don't know exactly when Rails picks each module to use, but this seems to be used by `app` in the console (for instance, `app.project_path` would fail before, but works now). | ||||
* | | Improve & fix the performance bar UI and behavior | Rémy Coutable | 2017-07-06 | 1 | -1/+1 |
|/ | |||||
* | Create and use project path helpers that only need a project, no namespace | Douwe Maan | 2017-07-05 | 1 | -0/+20 |
| | |||||
* | Resolve "Navigation - Move contextual navigation to sidebar" | Annabel Dunstone Gray | 2017-06-28 | 1 | -0/+1 |
| | |||||
* | Top navigation redesign | Phil Hughes | 2017-06-21 | 1 | -0/+1 |
| | | | | | | | Start of the new navigation by redesigning just the top navigation menu. This is only shown when a cookie is set. Part of #32794 | ||||
* | Fix vendor/peek.js so that it can be bundled with Webpack | Rémy Coutable | 2017-06-09 | 1 | -1/+0 |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Small adjustments | Rémy Coutable | 2017-06-09 | 1 | -0/+1 |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | New performance bar that can be enabled with the `p b` shortcut | Rémy Coutable | 2017-06-09 | 1 | -0/+1 |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | add rss_token attribute to user model | Alexis Reigel | 2017-05-24 | 1 | -0/+1 |
| | |||||
* | Add test.js and test.css to disable animations during testing and include ↵disable-css-and-jquery-animations-for-capybara | Luke "Jared" Bennett | 2017-05-15 | 1 | -0/+1 |
| | | | | these in _head when testing | ||||
* | Remove CI/CD models directory from `eager_load_paths` | Grzegorz Bizon | 2017-05-09 | 1 | -1/+0 |
| | | | | | | | CI/CD models are already located inside `CI` module, thus usual Rails autoloading principles apply. See https://github.com/rails/rails/issues/28854 for more details. | ||||
* | Disable FastGettext from translating AR attrs. | Ruben Davila | 2017-05-04 | 1 | -0/+3 |
| | | | | | It isn't working fine when using POROs in forms like WikiPage, the following error is being raised: undefined method `abstract_class?' for Object:Class | ||||
* | adds git terminal prompt env var to application rb24187-set-git-terminal-prompt-env-var-in-initializer | Tiago Botelho | 2017-04-03 | 1 | -0/+1 |
| | |||||
* | Restore unicode-file-name images for legacy img emojisfix-legacy-emojis-using-unicode-file-name | Eric Eastwood | 2017-03-16 | 1 | -0/+2 |
| | |||||
* | Move `ResolveDiscussions` into `concerns/issues` folder | Bob Van Landuyt | 2017-03-13 | 1 | -1/+2 |
| | |||||
* | move u2f library to webpackmove-u2f-bundle | Mike Greiling | 2017-03-07 | 1 | -1/+0 |
| | |||||
* | Use native unicode emojis | Eric Eastwood | 2017-03-06 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | - gl_emoji for falling back to image/css-sprite when the browser doesn't support an emoji - Markdown rendering (Banzai filter) - Autocomplete - Award emoji menu - Perceived perf - Immediate response because we now build client-side - Update `digests.json` generation in gemojione rake task to be more useful and include `unicodeVersion` MR: !9437 See issues - #26371 - #27250 - #22474 | ||||
* | Merge branch 'remove-vendored-raphael-library' into 'master' | Filipa Lacerda | 2017-03-06 | 1 | -1/+0 |
|\ | | | | | | | | | Refactor network graph bundle to ES module syntax See merge request !9696 | ||||
| * | remove manually vendored raphael library in favor of node module | Mike Greiling | 2017-03-05 | 1 | -1/+0 |
| | | |||||
* | | Remove unecessary calls to limit_user!, UniqueIps Middleware, and address MR ↵ | Pawel Chojnacki | 2017-03-06 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | review - cleanup formating in haml - clarify time window is in seconds - cleanup straneous chunks in db/schema - rename count_uniqe_ips to update_and_return_ips_count - other | ||||
* | | Allow limiting logging in users from too many different IPs. | Pawel Chojnacki | 2017-03-06 | 1 | -0/+5 |
|/ | |||||
* | merge cropper library into profile_bundlecommons-chunk-plugin | Mike Greiling | 2017-03-03 | 1 | -1/+0 |
| | |||||
* | CORS: Whitelist pagination headersexpose-pagination-headers | Robert Schilling | 2017-03-02 | 1 | -2/+2 |
| | |||||
* | add rack middleware to proxy webpack dev server | Mike Greiling | 2017-02-01 | 1 | -0/+2 |
| | |||||
* | precompile webpack assets when testing | Mike Greiling | 2017-01-10 | 1 | -0/+1 |
| | |||||
* | migrate all javascript asset bundles and require syntax | Mike Greiling | 2017-01-10 | 1 | -17/+3 |
| | |||||
* | add webpack, webpack-rails, and webpack-dev-server along with a simple hello ↵ | Mike Greiling | 2017-01-06 | 1 | -0/+5 |
| | | | | | | | | world test Add the following line to GDK Procfile to play with it: webpack: exec support/exec-cd gitlab npm run dev-server | ||||
* | Add KaTeX fonts to assets paths and precompile | Hiroyuki Sato | 2016-12-22 | 1 | -0/+2 |
| | |||||
* | Remove unneeded bundle refs.backport-mr-widget-ci-js | Bryce Johnson | 2016-12-21 | 1 | -2/+0 |
| | |||||
* | Backport moving MR widget CI JS out of script tag. | Bryce Johnson | 2016-12-21 | 1 | -0/+3 |
| | |||||
* | Add xterm.js 2.1.0 and a wrapper class to the asset pipeline | Nick Thomas | 2016-12-19 | 1 | -0/+2 |
| | |||||
* | Merge branch 'rs-filter-params' into 'security' bpj-issuable-sidebar-autoupdatebackport-link_to_member_avatar | Rémy Coutable | 2016-12-15 | 1 | -1/+3 |
| | | | | | | | Filter `incoming_email_token` and `runners_token` parameters Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2676 See merge request !2045 | ||||
* | Merge branch 'katex-math' into 'master' | Sean McGivern | 2016-12-15 | 1 | -0/+2 |
|\ | | | | | | | | | | | | | Render math in Asciidoc and Markdown with KaTeX using code blocks Closes #13690 and #13180 See merge request !8003 | ||||
| * | Render math in Asciidoc and Markdown with KaTeX using code blocks | Munken | 2016-12-14 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'rs-filter-authentication_token' into 'security' | Douwe Maan | 2016-12-08 | 1 | -1/+2 |
|/ | | | | | Add authentication_token to filter_parameters list See merge request !2041 |