summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '34319-remove-useless-type-definitions-from-specs' into 'master'Robert Speicher2017-07-27844-1249/+1249
|\
| * Use described_class when possibleRémy Coutable2017-07-27106-390/+390
| * Remove superfluous lib: true, type: redis, service: true, models: true, servi...Rémy Coutable2017-07-27495-498/+498
| * Remove superfluous type defs in specsKeifer Furzland2017-07-27349-361/+361
* | Merge branch 'pawel/ensure_temp_files_are_deleted_in_fs_metrics-35457' into '...Douwe Maan2017-07-276-77/+110
|\ \
| * | add comment explaining use of shell commands and file operations in the same ...Pawel Chojnacki2017-07-271-0/+7
| * | Remove unnecessary begin/endpawel/ensure_temp_files_are_deleted_in_fs_metrics-35457Pawel Chojnacki2017-07-261-6/+4
| * | use `.zero?` instead of `== 0`Pawel Chojnacki2017-07-262-5/+5
| * | Stop abusing subject to store results,Pawel Chojnacki2017-07-263-64/+67
| * | Fix redis check with_timing method usagePawel Chojnacki2017-07-251-8/+7
| * | Add Changelog about temp file removal fixPawel Chojnacki2017-07-252-1/+4
| * | Ensure test files are deleted after testsPawel Chojnacki2017-07-254-29/+52
* | | Merge branch 'patch-18' into 'master'Marcia Ramos2017-07-271-1/+1
|\ \ \
| * | | remove extra spaceBen Bodenmiller2017-07-261-1/+1
* | | | Merge branch 'rc/fix-branches-api-endpoint' into 'master'Sean McGivern2017-07-2714-224/+407
|\ \ \ \
| * | | | DRY the branches API requirements definitionRémy Coutable2017-07-273-6/+11
| * | | | Fix the /projects/:id/repository/branches endpoint to handle dots in the bran...Rémy Coutable2017-07-2713-223/+401
| | |_|/ | |/| |
* | | | Merge branch 'feature/backup-custom-path' into 'master'Rémy Coutable2017-07-276-25/+115
|\ \ \ \
| * | | | Support custom directory in gitlab:backup:create taskMarkus Koller2017-07-276-25/+115
* | | | | Merge branch 'assets-task-compile-langs' into 'master'Rubén Dávila2017-07-271-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Compile JS lang files before webpack compileassets-task-compile-langsPhil Hughes2017-07-271-0/+1
* | | | | Merge branch 'docs-fix-docs_styleguide' into 'master'Rémy Coutable2017-07-272-3/+3
|\ \ \ \ \
| * | | | | Remove mentions of SeanPackham since he's no longer with GitLabRémy Coutable2017-07-272-3/+3
|/ / / / /
* | | | | Merge branch 'rc/35599-stop-the-bleeding-of-default_url_options' into 'master'Sean McGivern2017-07-271-0/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Ensure the overriding of Gitlab::Application.routes.default_url_options is on...rc/35599-stop-the-bleeding-of-default_url_optionsRémy Coutable2017-07-271-0/+4
* | | | | Merge branch 'HA-external-urls-docs' into 'master'Sean McGivern2017-07-271-0/+6
|\ \ \ \ \
| * | | | | Add note on external url setting for HA clusters.HA-external-urls-docsChenjerai Katanda2017-07-251-0/+6
* | | | | | Merge branch 'winh-issuable-sidebar-height' into 'master'Tim Zallmann2017-07-271-0/+4
|\ \ \ \ \ \
| * | | | | | Make issuable searchbar full heightwinh-issuable-sidebar-heightwinh2017-07-251-0/+4
* | | | | | | Merge branch '33601-add-csrf-token-verification-to-api' into 'master'Sean McGivern2017-07-278-14/+168
|\ \ \ \ \ \ \
| * | | | | | | Add specsDouwe Maan2017-07-274-7/+145
| * | | | | | | Rescue only from ActionController::InvalidAuthenticityTokenDouwe Maan2017-07-262-2/+10
| * | | | | | | Remove spec/lib/api/helpers/csrf_tokens_spec.rbblackst0ne2017-07-261-42/+0
| * | | | | | | Add `rescue false`.blackst0ne2017-07-263-3/+3
| * | | | | | | Refactor CSRF protectionblackst0ne2017-07-264-34/+8
| * | | | | | | Add CSRF token verification to APIblackst0ne2017-07-263-4/+80
* | | | | | | | Merge branch '35191-prioritized-labels-for-non-member' into 'master'Rémy Coutable2017-07-273-5/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove help message about prioritized labels for non-membersTakuya Noguchi2017-07-273-5/+20
* | | | | | | | | Merge branch 'tc-issue-api-assignee' into 'master'Sean McGivern2017-07-275-3/+63
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow query param scope for /issues API endpointtc-issue-api-assigneeToon Claes2017-07-243-14/+26
| * | | | | | | | | Add author_id & assignee_id param to /issues APIToon Claes2017-07-245-1/+49
* | | | | | | | | | Merge branch 'rc/fix-tests-factories' into 'master'Sean McGivern2017-07-276-9/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Fix the :project factory by not copying the test repo twicerc/fix-tests-factoriesRémy Coutable2017-07-276-9/+5
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch '35539-can-t-create-a-merge-request-containing-a-binary-file-wit...Rémy Coutable2017-07-2710-9/+79
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix saving diffs that are not valid UTF-835539-can-t-create-a-merge-request-containing-a-binary-file-with-non-utf-8-charactersSean McGivern2017-07-2610-9/+79
* | | | | | | | | | Merge branch 'inline-js-removal-merge-requests' into 'master'Phil Hughes2017-07-275-27/+27
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Inline JS Removal for Merge RequestsTim Zallmann2017-07-275-27/+27
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'fix-participant-name-trailing' into 'master'Phil Hughes2017-07-271-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix participant name link trailing space on milestone pagefix-participant-name-trailingClement Ho2017-07-261-2/+2
| |/ / / / / / / /
* | | | | | | | | Merge branch 'patch-19' into 'master'Clement Ho2017-07-261-1/+1
|\ \ \ \ \ \ \ \ \
View Lorry Controller Status