| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Make dropdown style on repository page consistentwinh-repository-dropdown-style | winh | 2017-07-31 | 1 | -0/+22 |
| | | |||||
| * | Merge branch '34319-remove-useless-type-definitions-from-specs' into 'master' | Robert Speicher | 2017-07-27 | 844 | -1249/+1249 |
| |\ | | | | | | | | | | | | | Remove superfluous tags in RSpec examples. Closes #34319 See merge request !12754 | ||||
| | * | Use described_class when possible | Rémy Coutable | 2017-07-27 | 106 | -390/+390 |
| | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | Remove superfluous lib: true, type: redis, service: true, models: true, ↵ | Rémy Coutable | 2017-07-27 | 495 | -498/+498 |
| | | | | | | | | | | | | | services: true, no_db: true, api: true Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | Remove superfluous type defs in specs | Keifer Furzland | 2017-07-27 | 349 | -361/+361 |
| | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Merge branch 'pawel/ensure_temp_files_are_deleted_in_fs_metrics-35457' into ↵ | Douwe Maan | 2017-07-27 | 6 | -77/+110 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Ensure test files are deleted after fs metrics gathering run Closes #35457 See merge request !13080 | ||||
| | * | | add comment explaining use of shell commands and file operations in the same ↵ | Pawel Chojnacki | 2017-07-27 | 1 | -0/+7 |
| | | | | | | | | | | | | | methods | ||||
| | * | | Remove unnecessary begin/endpawel/ensure_temp_files_are_deleted_in_fs_metrics-35457 | Pawel Chojnacki | 2017-07-26 | 1 | -6/+4 |
| | | | | |||||
| | * | | use `.zero?` instead of `== 0` | Pawel Chojnacki | 2017-07-26 | 2 | -5/+5 |
| | | | | |||||
| | * | | Stop abusing subject to store results, | Pawel Chojnacki | 2017-07-26 | 3 | -64/+67 |
| | | | | | | | | | | | | | + add helper methods to cleanup fs_shards metrics | ||||
| | * | | Fix redis check with_timing method usage | Pawel Chojnacki | 2017-07-25 | 1 | -8/+7 |
| | | | | |||||
| | * | | Add Changelog about temp file removal fix | Pawel Chojnacki | 2017-07-25 | 2 | -1/+4 |
| | | | | | | | | | | | | | + remove whitespace | ||||
| | * | | Ensure test files are deleted after tests | Pawel Chojnacki | 2017-07-25 | 4 | -29/+52 |
| | | | | |||||
| * | | | Merge branch 'patch-18' into 'master' | Marcia Ramos | 2017-07-27 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | remove extra space See merge request !13114 | ||||
| | * | | | remove extra space | Ben Bodenmiller | 2017-07-26 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'rc/fix-branches-api-endpoint' into 'master' | Sean McGivern | 2017-07-27 | 14 | -224/+407 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix the `/projects/:id/repository/branches endpoint` to handle dots in the branch name when the project full patch contains a `/` See merge request !13115 | ||||
| | * | | | | DRY the branches API requirements definition | Rémy Coutable | 2017-07-27 | 3 | -6/+11 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | | Fix the /projects/:id/repository/branches endpoint to handle dots in the ↵ | Rémy Coutable | 2017-07-27 | 13 | -223/+401 |
| | | |_|/ | |/| | | | | | | | | | | | | | | | | | | branch name when the project full patch contains a `/` Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | Merge branch 'feature/backup-custom-path' into 'master' | Rémy Coutable | 2017-07-27 | 6 | -25/+115 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Support custom directory in gitlab:backup:create task See merge request !12984 | ||||
| | * | | | | Support custom directory in gitlab:backup:create task | Markus Koller | 2017-07-27 | 6 | -25/+115 |
| | | | | | | |||||
| * | | | | | Merge branch 'assets-task-compile-langs' into 'master' | Rubén Dávila | 2017-07-27 | 1 | -0/+1 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Compile JS lang files before webpack compile Closes #35615 See merge request !13122 | ||||
| | * | | | | Compile JS lang files before webpack compileassets-task-compile-langs | Phil Hughes | 2017-07-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | Closes #35615 | ||||
| * | | | | | 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 |
| | |/ / / / / / / / | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |