summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update CI parallelization descriptionrc/update-testing-docsRémy Coutable2017-09-271-10/+10
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch ↵Rémy Coutable2017-09-273-2/+16
|\ | | | | | | | | | | | | | | | | '37467-helper-method-from-users-endpoint-overrides-api-helper-method' into 'master' find_user users helper method no longer overrides find_user API helper method. Closes #37467 See merge request gitlab-org/gitlab-ce!14418
| * 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.yml See merge request gitlab-org/gitlab-ce!14516
| * | 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 diff Closes #37641 See merge request gitlab-org/gitlab-ce!14454
| * | Stop breadcrumbs changing container when in side-by-side diffmr-side-by-side-breadcrumbs-containerPhil Hughes2017-09-253-1/+29
| | | | | | | | | | | | Closes #37641
* | | Merge branch '38198-fetch-github-api-per-100' into 'master'Grzegorz Bizon2017-09-273-14/+52
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "GitHub import should fetch 100 results per page to limit the change to hit rate limiting" Closes #38198 See merge request gitlab-org/gitlab-ce!14421
| * | | Add a spec for Github::Client and revert an `if !` to `unless`38198-fetch-github-api-per-100Rémy Coutable2017-09-262-1/+35
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Retrieve PR comments only when we know there are anyRémy Coutable2017-09-262-20/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Pull Request resource doesn't include the `comments` field, while the Issue resource does. And since we're looping through all issues anyway, we can freely check if the issue is a PR and has comments and in this case only fetch comments for it. That means if you have 1000 PRs but only 200 with comments, you will do 200 API requests instead of 1000. :notbad: Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Fetch 100 results when calling the GitHub API in Github::ImportRémy Coutable2017-09-261-6/+6
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'winh-full-height-boards-sidebar' into 'master'Annabel Dunstone Gray2017-09-265-24/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make issue boards sidebar full height Closes #36980 and #36447 See merge request gitlab-org/gitlab-ce!14214
| * | | | 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
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Backport some changes from EE See merge request gitlab-org/gitlab-ce!14304
| * | | Remove `weight` from IssuableFinder::SCALAR_PARAMS and improve the array ↵rc/backport-ce-to-ee-changesRémy Coutable2017-09-261-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | formatting Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Backport part of c777bb91fd7 and 4074cb3b7c16 from EERémy Coutable2017-09-262-1/+5
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Backport doc change from latest upstream mergeRémy Coutable2017-09-261-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2906 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | 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… See merge request gitlab-org/gitlab-ce!14475
| * | | | Allow n+1s caused by avatar fetches on the project dashboard. See ↵avatar_n_plus_oneAndrew Newdigate2017-09-251-2/+5
| | |_|/ | |/| | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/38261
* | | | Merge branch 'mobile-breadcrumbs-divider' into 'master'Annabel Dunstone Gray2017-09-262-5/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix sidebar mobile toggle button border See merge request gitlab-org/gitlab-ce!14502
| * | | | 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 deemed unacceptable [ci skip] See merge request gitlab-org/gitlab-ce!14485
| * | | | | 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=true See merge request gitlab-org/gitlab-ce!14498
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug that caused merge requests with diff notes imported from Bitbucket to raise errors Closes #38100 See merge request gitlab-org/gitlab-ce!14438
| * | | | | 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 commit Closes #35692 See merge request gitlab-org/gitlab-ce!13521
| * | | | | Expose last pipeline details in API response when getting a single commitMehdi Lahmam2017-09-266-2/+42
| | | | | | | | | | | | | | | | | | | | | | | | Closes #35692.
* | | | | | Merge branch 'remove-temporary-ci-index' into 'master'Yorick Peterse2017-09-263-1/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove a temporary index on ci_builds meant only for earlier migration See merge request gitlab-org/gitlab-ce!14378
| * | | | | | Remove an unneeded index on ci_builds left in some databasesremove-temporary-ci-indexGreg Stark2017-09-263-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migration 20170919211300_remove_temporary_ci_builds_index.rb created a temporary partial index and tried to drop it at the end of the migration. In some circumstances apparently it failed to drop the index and it ended up in our schema.rb. This accidentally failed to fail due to a bug in the regular expression for partial indexes which caused the index creation in schema.rb to be ignored. Now that that's fixed we could be resurrecting this zombie index from the past in some but not all databases. Add a migration to drop this index if it's present to reconcile this discrepancy.
* | | | | | | 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) See merge request gitlab-org/gitlab-ce!14501
| * | | | | | | Update omniauth-azure-oauth2 to 0.0.9 (Support Office 365 Germany)ueberbit/gitlab-ce-omniauth-azure-oauth2Florian Weber2017-09-263-6/+9
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'changes-bar-dynamic-placeholder' into 'master'Filipa Lacerda2017-09-264-40/+83
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Dynamically create offset for sticky bar See merge request gitlab-org/gitlab-ce!14280
| * | | | | | 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
| | | | | | |
* | | | | | | Merge branch '34371-cycle-analitcs-components-vue' into 'master'Phil Hughes2017-09-2619-433/+400
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves cycle analytics components into vue files See merge request gitlab-org/gitlab-ce!14464
| * | | | | | | Moves cycle analytics components into vue filesFilipa Lacerda2017-09-2619-433/+400
|/ / / / / / /
* | | | | | | Merge branch '38374-add-note-for-upgrading-helm-chart-prior-to-1-3-5-docs' ↵Achilleas Pipinellis2017-09-261-1/+16
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add note for upgrading Helm chart prior to 1.3.5 - docs Closes #38374 See merge request gitlab-org/gitlab-ce!14491
| * | | | | | Add note for upgrading Helm chart prior to 1.3.5 - docsJoshua Lambert2017-09-261-1/+16
|/ / / / / /
* | | | | | Merge branch 'remove-old-nav-styles' into 'master'Phil Hughes2017-09-26102-545/+86
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Remove old nav code - Part 1 See merge request gitlab-org/gitlab-ce!14379
| * | | | | Fix UI bugsremove-old-nav-stylesAnnabel Dunstone Gray2017-09-253-12/+15
| | | | | |
View Lorry Controller Status