Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Moved the duplicate Available Refs to a default in RefSelectDropdowninline-js-removal-projects-other | Tim Zallmann | 2017-07-28 | 2 | -3/+4 |
| | |||||
* | Updated Event Handlers based on MR discussion | Tim Zallmann | 2017-07-28 | 1 | -8/+8 |
| | |||||
* | Left a bracket in the line :-/ | Tim Zallmann | 2017-07-27 | 1 | -1/+1 |
| | |||||
* | Fixed the strange escaping | Tim Zallmann | 2017-07-27 | 1 | -1/+1 |
| | |||||
* | Maybe that fixes the escaping in the URL | Tim Zallmann | 2017-07-27 | 1 | -1/+1 |
| | |||||
* | Revert "Due to more async loading the tests could fail, trying to fix it ↵ | Tim Zallmann | 2017-07-27 | 1 | -4/+0 |
| | | | | | | with wait_for_requests" This reverts commit 0c33f384bb2fd2bd97efa4d3fec2888393683fb1. | ||||
* | Due to more async loading the tests could fail, trying to fix it with ↵ | Tim Zallmann | 2017-07-27 | 1 | -0/+4 |
| | | | | wait_for_requests | ||||
* | Fixes New Project Bug | Tim Zallmann | 2017-07-27 | 3 | -5/+5 |
| | |||||
* | Converted Pipelines Charts | Tim Zallmann | 2017-07-27 | 4 | -50/+47 |
| | |||||
* | TreeContent moved to external JS | Tim Zallmann | 2017-07-27 | 2 | -7/+4 |
| | |||||
* | Moved Inline JS for Pipelines Charts + new Pipeline to dispatcher | Tim Zallmann | 2017-07-27 | 5 | -5/+39 |
| | |||||
* | Changed the data for New Tag to a script block | Tim Zallmann | 2017-07-27 | 2 | -6/+2 |
| | |||||
* | Inline JS of Wiki Sidebar to dispatcher | Tim Zallmann | 2017-07-27 | 2 | -3/+1 |
| | |||||
* | Set New Tags to ignore Inline JS | Tim Zallmann | 2017-07-27 | 1 | -0/+1 |
| | |||||
* | Project New moved to external File | Tim Zallmann | 2017-07-27 | 3 | -43/+46 |
| | |||||
* | Merge branch 'docs-fix-docs_styleguide' into 'master' | Rémy Coutable | 2017-07-27 | 2 | -3/+3 |
|\ | | | | | | | | | Remove mentions of SeanPackham since he's no longer with GitLab See merge request !13081 | ||||
| * | Remove mentions of SeanPackham since he's no longer with GitLab | Rémy Coutable | 2017-07-27 | 2 | -3/+3 |
|/ | |||||
* | Merge branch 'rc/35599-stop-the-bleeding-of-default_url_options' into 'master' | Sean McGivern | 2017-07-27 | 1 | -0/+4 |
|\ | | | | | | | | | Ensure the overriding of Gitlab::Application.routes.default_url_options is only local See merge request !13125 | ||||
| * | Ensure the overriding of Gitlab::Application.routes.default_url_options is ↵rc/35599-stop-the-bleeding-of-default_url_options | Rémy Coutable | 2017-07-27 | 1 | -0/+4 |
| | | | | | | | | | | | | only local Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Merge branch 'HA-external-urls-docs' into 'master' | Sean McGivern | 2017-07-27 | 1 | -0/+6 |
|\ \ | | | | | | | | | | | | | Add note on external url setting for HA clusters. See merge request !13089 | ||||
| * | | Add note on external url setting for HA clusters.HA-external-urls-docs | Chenjerai Katanda | 2017-07-25 | 1 | -0/+6 |
| | | | |||||
* | | | Merge branch 'winh-issuable-sidebar-height' into 'master' | Tim Zallmann | 2017-07-27 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Make issuable searchbar full height Closes #35417 See merge request !13046 | ||||
| * | | | Make issuable searchbar full heightwinh-issuable-sidebar-height | winh | 2017-07-25 | 1 | -0/+4 |
| | | | | |||||
* | | | | Merge branch '33601-add-csrf-token-verification-to-api' into 'master' | Sean McGivern | 2017-07-27 | 8 | -14/+168 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add CSRF token verification to API" Closes #33601 See merge request !12154 | ||||
| * | | | | Add specs | Douwe Maan | 2017-07-27 | 4 | -7/+145 |
| | | | | | |||||
| * | | | | Rescue only from ActionController::InvalidAuthenticityToken | Douwe Maan | 2017-07-26 | 2 | -2/+10 |
| | | | | | |||||
| * | | | | Remove spec/lib/api/helpers/csrf_tokens_spec.rb | blackst0ne | 2017-07-26 | 1 | -42/+0 |
| | | | | | |||||
| * | | | | Add `rescue false`. | blackst0ne | 2017-07-26 | 3 | -3/+3 |
| | | | | | |||||
| * | | | | Refactor CSRF protection | blackst0ne | 2017-07-26 | 4 | -34/+8 |
| | | | | | |||||
| * | | | | Add CSRF token verification to API | blackst0ne | 2017-07-26 | 3 | -4/+80 |
| | | | | | |||||
* | | | | | Merge branch '35191-prioritized-labels-for-non-member' into 'master' | Rémy Coutable | 2017-07-27 | 3 | -5/+20 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove help message about prioritized labels for non-members Closes #35191 See merge request !12912 | ||||
| * | | | | | Remove help message about prioritized labels for non-members | Takuya Noguchi | 2017-07-27 | 3 | -5/+20 |
| | | | | | | |||||
* | | | | | | Merge branch 'tc-issue-api-assignee' into 'master' | Sean McGivern | 2017-07-27 | 5 | -3/+63 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add author_id & assignee_id param to /issues API Closes #29430 See merge request !13004 | ||||
| * | | | | | | Allow query param scope for /issues API endpointtc-issue-api-assignee | Toon Claes | 2017-07-24 | 3 | -14/+26 |
| | | | | | | | |||||
| * | | | | | | Add author_id & assignee_id param to /issues API | Toon Claes | 2017-07-24 | 5 | -1/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow issues filtering on `author_id` and `assignee_id`. | ||||
* | | | | | | | Merge branch 'rc/fix-tests-factories' into 'master' | Sean McGivern | 2017-07-27 | 6 | -9/+5 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | Fix the :project factory by not copying the test repo twice See merge request !13123 | ||||
| * | | | | | | Fix the :project factory by not copying the test repo twicerc/fix-tests-factories | Rémy Coutable | 2017-07-27 | 6 | -9/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, fixing some calls to the :project factory with the :test_repo trait since this trait is already included in the :project factory. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | | | Merge branch ↵ | Rémy Coutable | 2017-07-27 | 10 | -9/+79 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '35539-can-t-create-a-merge-request-containing-a-binary-file-with-non-utf-8-characters' into 'master' Resolve "Can't create a merge request containing a binary file with non-UTF-8 characters" Closes #35539 See merge request !13086 | ||||
| * | | | | | | | Fix saving diffs that are not valid UTF-835539-can-t-create-a-merge-request-containing-a-binary-file-with-non-utf-8-characters | Sean McGivern | 2017-07-26 | 10 | -9/+79 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we used Psych, which would: 1. Check if a string was encoded as binary, and not ASCII-compatible. 2. Add the !binary tag in that case. 3. Convert to base64. We need to do the same thing, using a new column in place of the tag. | ||||
* | | | | | | | | Merge branch 'inline-js-removal-merge-requests' into 'master' | Phil Hughes | 2017-07-27 | 5 | -27/+27 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inline JS Removal for Merge Requests See merge request !13053 | ||||
| * | | | | | | | | Inline JS Removal for Merge Requests | Tim Zallmann | 2017-07-27 | 5 | -27/+27 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'fix-participant-name-trailing' into 'master' | Phil Hughes | 2017-07-27 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix participant name link trailing space on milestone page Closes #35419 See merge request !13117 | ||||
| * | | | | | | | Fix participant name link trailing space on milestone pagefix-participant-name-trailing | Clement Ho | 2017-07-26 | 1 | -2/+2 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'patch-19' into 'master' | Clement Ho | 2017-07-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change Fogbugz button to FogBugz See merge request !13113 | ||||
| * | | | | | | | change Fogbugz button to FogBugz | Ben Bodenmiller | 2017-07-26 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'rs-update-large-table-list' into 'master' | Grzegorz Bizon | 2017-07-26 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Update the large table list in AddColumnWithDefaultToLargeTable cop See merge request !13112 | ||||
| * | | | | | | | Update the large table list in AddColumnWithDefaultToLargeTable cop | Robert Speicher | 2017-07-26 | 1 | -0/+3 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - ci_builds -- 33 million rows, 55 GB - merge_request_diff_files -- 5 million rows, 9 GB (and growing rapidly) - merge_request_diffs -- 5 million rows, 190 GB | ||||
* | | | | | | | Merge branch 'added-nvmrc' into 'master' | Mike Greiling | 2017-07-26 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added .nvmrc See merge request !9183 | ||||
| * | | | | | | | Update .nvmrc to 7.5 | Luke "Jared" Bennett | 2017-06-22 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | added .nvmrc | Luke "Jared" Bennett | 2017-06-22 | 1 | -0/+1 |
| | | | | | | | |