summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* spec fixesbreadcrumb-item-linksPhil Hughes2017-09-282-3/+3
* Fixed breadcrumb title not linkingPhil Hughes2017-09-274-6/+15
* Merge branch '35366-k8s-namespace-docs' into 'master'Marcia Ramos2017-09-272-24/+31
|\
| * Clarify k8s project namespace35366-k8s-namespace-docsAchilleas Pipinellis2017-09-252-24/+31
* | Update CHANGELOG.md for 10.0.2Jarka Kadlecova2017-09-275-20/+7
* | Merge branch '38378-testenv-can-t-handle-component-versions-with-a-branch-nam...Rémy Coutable2017-09-271-0/+3
|\ \
| * | Fix component update with branch specifiers on CI38378-testenv-can-t-handle-component-versions-with-a-branch-name-in-ciAlejandro Rodríguez2017-09-261-0/+3
* | | Merge branch '37467-helper-method-from-users-endpoint-overrides-api-helper-me...Rémy Coutable2017-09-273-2/+16
|\ \ \
| * | | find_user users helper method no longer overrides find_user API helper method.37467-helper-method-from-users-endpoint-overrides-api-helper-methodTiago Botelho2017-09-263-2/+16
* | | | Merge branch 'docs-using-reserved-keywords-in-gitlab-ci-yml' into 'master'Achilleas Pipinellis2017-09-271-0/+5
|\ \ \ \
| * | | | Add how to use reserved words in gitlab-ci.ymlFabio Busatto2017-09-271-0/+5
|/ / / /
* | | | Merge branch 'mr-side-by-side-breadcrumbs-container' into 'master'Filipa Lacerda2017-09-273-1/+29
|\ \ \ \
| * | | | Stop breadcrumbs changing container when in side-by-side diffmr-side-by-side-breadcrumbs-containerPhil Hughes2017-09-253-1/+29
* | | | | Merge branch '38198-fetch-github-api-per-100' into 'master'Grzegorz Bizon2017-09-273-14/+52
|\ \ \ \ \
| * | | | | Add a spec for Github::Client and revert an `if !` to `unless`38198-fetch-github-api-per-100Rémy Coutable2017-09-262-1/+35
| * | | | | Retrieve PR comments only when we know there are anyRémy Coutable2017-09-262-20/+24
| * | | | | Fetch 100 results when calling the GitHub API in Github::ImportRémy Coutable2017-09-261-6/+6
* | | | | | Merge branch 'winh-full-height-boards-sidebar' into 'master'Annabel Dunstone Gray2017-09-265-24/+21
|\ \ \ \ \ \
| * | | | | | Make issue boards sidebar full heightWinnie Hellmann2017-09-265-24/+21
|/ / / / / /
* | | | | | Merge branch 'rc/backport-ce-to-ee-changes' into 'master'Grzegorz Bizon2017-09-263-12/+34
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove `weight` from IssuableFinder::SCALAR_PARAMS and improve the array form...rc/backport-ce-to-ee-changesRémy Coutable2017-09-261-1/+19
| * | | | | Backport part of c777bb91fd7 and 4074cb3b7c16 from EERémy Coutable2017-09-262-1/+5
| * | | | | Backport doc change from latest upstream mergeRémy Coutable2017-09-261-11/+11
* | | | | | Merge branch 'avatar_n_plus_one' into 'master'Rémy Coutable2017-09-261-2/+5
|\ \ \ \ \ \
| * | | | | | Allow n+1s caused by avatar fetches on the project dashboard. See https://git...avatar_n_plus_oneAndrew Newdigate2017-09-251-2/+5
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'mobile-breadcrumbs-divider' into 'master'Annabel Dunstone Gray2017-09-262-5/+7
|\ \ \ \ \ \
| * | | | | | Fix sidebar mobile toggle button bordermobile-breadcrumbs-dividerPhil Hughes2017-09-262-5/+7
* | | | | | | Merge branch 'doc-license-wtfpl-rejected' into 'master'Robert Speicher2017-09-261-0/+3
|\ \ \ \ \ \ \
| * | | | | | | WTFPL is deamed unacceptabledoc-license-wtfpl-rejectedKim "BKC" Carlbäcker2017-09-251-0/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'dm-simple-project-avatar-url' into 'master'Rémy Coutable2017-09-265-5/+14
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Expose avatar_url when requesting list of projects from API with simple=truedm-simple-project-avatar-urlDouwe Maan2017-09-265-5/+14
* | | | | | | Merge branch 'dm-bitbucket-import-truncated-shas' into 'master'Robert Speicher2017-09-267-16/+136
|\ \ \ \ \ \ \
| * | | | | | | Add specsdm-bitbucket-import-truncated-shasDouwe Maan2017-09-252-0/+93
| * | | | | | | Remove unnecessary commentsDouwe Maan2017-09-252-4/+2
| * | | | | | | Add changelogDouwe Maan2017-09-251-0/+6
| * | | | | | | Properly compare diff refs and diff positions when shas are truncatedDouwe Maan2017-09-253-13/+31
| * | | | | | | Expand truncated Bitbucket pull request source/target SHA if possibleDouwe Maan2017-09-251-2/+7
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'expose-last-pipeline-for-a-commit' into 'master'Rémy Coutable2017-09-266-2/+42
|\ \ \ \ \ \ \
| * | | | | | | Expose last pipeline details in API response when getting a single commitMehdi Lahmam2017-09-266-2/+42
* | | | | | | | Merge branch 'remove-temporary-ci-index' into 'master'Yorick Peterse2017-09-263-1/+32
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove an unneeded index on ci_builds left in some databasesremove-temporary-ci-indexGreg Stark2017-09-263-1/+32
* | | | | | | | | Merge branch 'ueberbit/gitlab-ce-omniauth-azure-oauth2' into 'master'Douwe Maan2017-09-263-6/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update omniauth-azure-oauth2 to 0.0.9 (Support Office 365 Germany)ueberbit/gitlab-ce-omniauth-azure-oauth2Florian Weber2017-09-263-6/+9
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'changes-bar-dynamic-placeholder' into 'master'Filipa Lacerda2017-09-264-40/+83
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | remove the sticky el from the test DOM after each testchanges-bar-dynamic-placeholderPhil Hughes2017-09-251-2/+6
| * | | | | | | | refactor tests to actually test browser behaviourPhil Hughes2017-09-252-49/+38
| * | | | | | | | removed commented out CSSPhil Hughes2017-09-252-6/+1
| * | | | | | | | spec fixesPhil Hughes2017-09-221-0/+6
| * | | | | | | | fixed and added specs for removing placeholder elementPhil Hughes2017-09-221-3/+37
| * | | | | | | | Dynamically create offset for sticky barPhil Hughes2017-09-222-12/+27