summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update prometheus client gem to fix problems with PID handling followingpawel/prometheus_client_pid_reuse_errorPawel Chojnacki2017-07-274-3/+11
* 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
|\ \ \ \ \
| * | | | | change Fogbugz button to FogBugzBen Bodenmiller2017-07-261-1/+1
* | | | | | Merge branch 'rs-update-large-table-list' into 'master'Grzegorz Bizon2017-07-261-0/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update the large table list in AddColumnWithDefaultToLargeTable copRobert Speicher2017-07-261-0/+3
| |/ / / /
* | | | | Merge branch 'added-nvmrc' into 'master'Mike Greiling2017-07-261-0/+1
|\ \ \ \ \
| * | | | | Update .nvmrc to 7.5Luke "Jared" Bennett2017-06-221-1/+1
| * | | | | added .nvmrcLuke "Jared" Bennett2017-06-221-0/+1
* | | | | | Merge branch 'patch-24' into 'master'Rémy Coutable2017-07-262-4/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Use LDAP-attributes configured in gitlab.yml in lookup instead of just hard-c...Casper2017-07-262-4/+4
|/ / / / /
* | | | | Merge branch 'fix/gb/handle-max-pages-artifacts-size-correctly' into 'master'Kamil Trzciński2017-07-263-1/+81
|\ \ \ \ \
| * | | | | Refactor max_size method in update pages servicefix/gb/handle-max-pages-artifacts-size-correctlyGrzegorz Bizon2017-07-261-3/+5
| * | | | | Fix rubocop offense in update pages service specsGrzegorz Bizon2017-07-251-1/+1
| * | | | | Add changelog for max pages artifacts size fixGrzegorz Bizon2017-07-251-0/+4
| * | | | | Handle maximum pages artifacts size correctlyGrzegorz Bizon2017-07-252-1/+75
* | | | | | Merge branch '29289-project-destroy-clean-up-after-failure' into 'master'Sean McGivern2017-07-260-0/+0
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge branch '29289-project-destroy-clean-up-after-failure' into 'master'Sean McGivern2017-07-2613-49/+185
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Move exception handling to executeTiago Botelho2017-07-2610-76/+81
| * | | | | | Refactors Project Destroy service and worker codeTiago Botelho2017-07-202-21/+28
| * | | | | | Add specs for ProjectDestroyWorkerTiago Botelho2017-07-209-49/+63
| * | | | | | WIP: Display a project's `delete_error` on the project homepage.Timothy Andrew2017-07-202-0/+10
| * | | | | | Handle errors while a project is being deleted asynchronously.Timothy Andrew2017-07-206-4/+104
* | | | | | | Merge remote-tracking branch 'dev/master'Douwe Maan2017-07-269-55/+391
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'mk-add-ldap-ssl-certificate-verification' into 'master'Douwe Maan2017-07-269-64/+400
| |\ \ \ \ \ \ \
| | * | | | | | | Add net-ldap explicitly since we use it directlyMichael Kozono2017-07-262-0/+2
| | * | | | | | | Mention how to test LDAP connectionsMichael Kozono2017-07-261-1/+2
| | * | | | | | | Fix plain LDAP (no encryption)Michael Kozono2017-07-264-7/+10
| | * | | | | | | Update more examplesMichael Kozono2017-07-262-3/+4
| | * | | | | | | Add changelog entryMichael Kozono2017-07-261-0/+4
| | * | | | | | | Change encryption descriptionMichael Kozono2017-07-261-11/+16
View Lorry Controller Status