summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use google-protobuf 3.4.0.2google-protobuf-3.4.0.2Jacob Vosmaer2017-08-241-1/+1
* Merge branch 'fix/sm/36731-improve-spec-spec-features-runners_spec-rb-and-spe...Kamil Trzciński2017-08-242-107/+93
|\
| * Fix testsfix/sm/36731-improve-spec-spec-features-runners_spec-rb-and-spec-features-admin-admin_runners_spec-rbShinya Maeda2017-08-231-29/+32
| * Refurbish spec/features/runners_spec.rbShinya Maeda2017-08-232-109/+92
* | Merge branch 'backstage/gb/after-save-asynchronous-job-hooks' into 'master'Kamil Trzciński2017-08-246-3/+27
|\ \
| * | Fix feature specs for pages deploymentbackstage/gb/after-save-asynchronous-job-hooksGrzegorz Bizon2017-08-231-1/+5
| * | Fix cycle analytics test data generation and specsGrzegorz Bizon2017-08-231-0/+2
| * | Merge branch 'master' into backstage/gb/after-save-asynchronous-job-hooksGrzegorz Bizon2017-08-23117-2255/+1506
| |\ \
| * | | Fix pipeline job worker specsGrzegorz Bizon2017-08-231-1/+1
| * | | Run job hooks after transation commits after createGrzegorz Bizon2017-08-231-1/+1
| * | | Add changelog for asynchronous job events fixGrzegorz Bizon2017-08-221-0/+5
| * | | Do not fire synrchonous hooks when creating a jobGrzegorz Bizon2017-08-222-1/+14
* | | | Merge branch 'thenable-ajax-api-calls' into 'master'Fatih Acet2017-08-245-20/+72
|\ \ \ \
| * | | | Added repo_service_spec for commitFlash and corrected repo_commit-Secion api ...thenable-ajax-api-callsLuke "Jared" Bennett2017-08-233-8/+60
| * | | | Update repo_commit_section to spy serviceLuke "Jared" Bennett2017-08-231-6/+5
| * | | | fix failing specs in repo_commit_section_spec.jsMike Greiling2017-08-181-1/+1
| * | | | fix eslint violations in repo editor filesMike Greiling2017-08-173-10/+12
| * | | | Add thenable ajax calls.Jacob Schatz2017-08-173-9/+8
* | | | | Merge branch 'fix-old-mr-diffs' into 'master'Douwe Maan2017-08-243-5/+70
|\ \ \ \ \
| * | | | | Show un-highlighted diffs when blobs are the sameSean McGivern2017-08-243-5/+54
| * | | | | Always return a simple diff viewerSean McGivern2017-08-222-0/+16
* | | | | | Merge branch 'archived-projects-only' into 'master'Douwe Maan2017-08-2410-31/+110
|\ \ \ \ \ \
| * | | | | | Add an option to list only archived projectsMehdi Lahmam2017-08-249-6/+57
| * | | | | | Refactor Admin::ProjectsFinder by extracting finders as private methodsMehdi Lahmam2017-08-242-26/+54
* | | | | | | Merge branch 'an-gitaly-ref-exists-extras' into 'master'Sean McGivern2017-08-247-7/+65
|\ \ \ \ \ \ \
| * | | | | | | Delegate Repository::branch_exists? and ref_exists? to Gitlab::GitAndrew Newdigate2017-08-247-7/+65
|/ / / / / / /
* | | | | | | Merge branch '36262_merge_request_reference_in_merge_commit_global' into 'mas...Sean McGivern2017-08-244-5/+9
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] changelog entry added for full merge request ref changeshaseeb2017-08-232-1/+5
| * | | | | | | fixes failing tests for full reference changehaseeb2017-08-132-3/+3
| * | | | | | | fix Merge request reference in merge commit is not globalhaseeb2017-08-131-2/+2
* | | | | | | | Merge branch 'fix/gb/avoid-races-when-cleaning-db-in-tests' into 'master'Sean McGivern2017-08-241-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Invalidate cache before cleaning db in tests after contextfix/gb/avoid-races-when-cleaning-db-in-testsGrzegorz Bizon2017-08-231-3/+3
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'zj-add-pipeline-source-variable' into 'master'Grzegorz Bizon2017-08-244-2/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | Expose CI_PIPELINE_SOURCE on CI jobsZeger-Jan van de Weg2017-08-234-2/+21
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'sh-fix-branch-count' into 'master'Douwe Maan2017-08-242-1/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix inconsistent number of branches when remote branches are presentsh-fix-branch-countStan Hu2017-08-232-1/+31
* | | | | | | | | Merge branch 'use_full_path_in_project_avatar_url_webhook' into 'master'Robert Speicher2017-08-232-1/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use full path of project's avatar in webhooksblackst0ne2017-08-182-1/+6
* | | | | | | | | | Merge branch 'dm-ldap-adapter-attributes' into 'master'Robert Speicher2017-08-234-8/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Support simple string LDAP attribute specifications, and search for name rath...dm-ldap-adapter-attributesDouwe Maan2017-08-234-8/+19
* | | | | | | | | | | Merge branch '36709-gpg-status' into 'master'Clement Ho2017-08-233-6/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix alignment of gpg status36709-gpg-statusAnnabel Dunstone Gray2017-08-233-6/+7
* | | | | | | | | | | Merge branch 'zj-fix-fe-blank-button' into 'master'Clement Ho2017-08-232-1/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix blank button not resetting project template valueZeger-Jan van de Weg2017-08-232-1/+6
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '36883-update-license-approval-process' into 'master'Douwe Maan2017-08-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update licensing query guidelinesNick Thomas2017-08-231-1/+1
* | | | | | | | | | | | Merge branch 'fix/gitlay-raw-blame-request-encoding' into 'master'Robert Speicher2017-08-231-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Properly encode Gitaly RawBlame request paramsfix/gitlay-raw-blame-request-encodingAhmad Sherif2017-08-231-2/+2
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'cache-issue-and-mr-counts' into 'master'Douwe Maan2017-08-2325-71/+301
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Cache the number of open issues and merge requestsYorick Peterse2017-08-2325-71/+301