summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fixed specs when merged event was emptymr-widget-merged-date-tooltipPhil Hughes2017-09-291-4/+10
|
* Fixes merge request widget date tooltip inconsistenciesPhil Hughes2017-09-296-21/+63
| | | | | | | | | | | | | | Previously the merge request widget would use the `updated_at` date as the tooltip text for both closed & merged states. This is incorrect as the `updated_at` date is actually changed when a user updates merge request through commenting, description changes or anything else. The widget states for merged & closed events now use their own event object which holds their own `updated_at` date string. Also this text has been correctly formatted through our date utilities to correctly display the right timezone data in a user friendly way. Closes #38545
* Merge branch 'remove-target-dd' into 'master'Filipa Lacerda2017-09-297-39/+2
|\ | | | | | | | | | | | | Remove target dd Closes #38485 See merge request gitlab-org/gitlab-ce!14558
| * Fix static analysis.remove-target-ddJacob Schatz2017-09-281-1/+0
| |
| * Fix karma testJacob Schatz2017-09-281-2/+0
| |
| * Removes the target branch and only uses the source branch.Jacob Schatz2017-09-284-16/+2
| |
| * Remove target ref switcher.Jacob Schatz2017-09-282-20/+0
| |
* | Merge branch '37335-counter-active-state' into 'master'Phil Hughes2017-09-292-3/+8
|\ \ | | | | | | | | | | | | | | | | | | Add active states to nav bar counters Closes #37335 See merge request gitlab-org/gitlab-ce!14569
| * | Add active states to nav bar counters37335-counter-active-stateAnnabel Dunstone Gray2017-09-282-3/+8
| | |
* | | Merge branch '38528-build-url' into 'master'Phil Hughes2017-09-293-1/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixes data parameter not being sent in ajax request for jobs log Closes #38528 See merge request gitlab-org/gitlab-ce!14564
| * | | Fixes data parameter not being sent in ajax request for jobs log38528-build-urlFilipa Lacerda2017-09-283-1/+20
| | | |
* | | | Merge branch '31113-add-guidelines-for-illustrations' into 'master'Mike Greiling2017-09-2915-0/+91
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Guidelines for illustrations See merge request gitlab-org/gitlab-ce!13097
| * | | | Add illustration link to ux index pagetauriedavis2017-09-261-0/+5
| | | | |
| * | | | Fix typo errorsHazel2017-09-221-4/+4
| | | | |
| * | | | Add the situation of illustration on mobileHazel2017-09-221-0/+3
| | | | |
| * | | | Add size part to the guidelineHazel2017-09-225-1/+30
| | | | |
| * | | | Illustration guidelines - Fix grammar error and update images.Hazel2017-09-223-13/+11
| | | | |
| * | | | Update illustrations.mdHazel Yang2017-09-221-2/+2
| | | | |
| * | | | Update image size in illustrations.mdHazel Yang2017-09-221-2/+2
| | | | |
| * | | | Add some images to illustrations.mdHazel Yang2017-09-221-6/+6
| | | | |
| * | | | Add the images for illustration guidelinesHazel2017-09-229-0/+0
| | | | |
| * | | | Update illustrations.mdHazel Yang2017-09-221-4/+8
| | | | |
| * | | | Update illustrations.mdHazel Yang2017-09-221-1/+1
| | | | |
| * | | | Update illustrations.mdHazel Yang2017-09-221-0/+52
| | | | |
| * | | | Add new fileHazel Yang2017-09-221-0/+0
| | | | |
* | | | | Merge branch 'feature/migrate-repository-add-tag-to-gitaly' into 'master'Robert Speicher2017-09-297-53/+101
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Repository#add_tag to Gitaly Closes gitaly#601 See merge request gitlab-org/gitlab-ce!14500
| * | | | | Migrate Gitlab::Git::Repository#add_tag to Gitalyfeature/migrate-repository-add-tag-to-gitalyAhmad Sherif2017-09-297-53/+101
|/ / / / / | | | | | | | | | | | | | | | Closes gitaly#601
* | | | | Merge branch 'feature/migrate-repository-rm-tag-to-gitaly' into 'master'Robert Speicher2017-09-289-16/+86
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Git::Repository#rm_tag to Gitaly Closes gitaly#562 See merge request gitlab-org/gitlab-ce!14388
| * | | | | Migrate Git::Repository#rm_tag to GitalyAhmad Sherif2017-09-289-16/+86
| | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#562
* | | | | | Merge branch 'acet-repo-editor-prevent-extra-request' into 'master'Jacob Schatz2017-09-283-7/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RepoEditor: Prevent extra network call for already opened files. Closes #38256 See merge request gitlab-org/gitlab-ce!14489
| * | | | | | RepoEditor: Prevent extra network call for already opened files.acet-repo-editor-prevent-extra-requestFatih Acet2017-09-273-7/+32
| | | | | | |
* | | | | | | Merge branch 'docs-writing-overview-usecases' into 'master'Job van der Voort2017-09-281-1/+46
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Feature overview and use cases Closes #38076 See merge request gitlab-org/gitlab-ce!14538
| * | | | | | | Docs: Feature overview and use casesMarcia Ramos2017-09-281-1/+46
|/ / / / / / /
* | | | | | | Merge branch 'docs-crosslink-pages-guides' into 'master'Achilleas Pipinellis2017-09-283-4/+64
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: crosslink Pages guides Closes #38427 See merge request gitlab-org/gitlab-ce!14542
| * | | | | | | copyedit - reorg headersMarcia Ramos2017-09-281-21/+21
| | | | | | | |
| * | | | | | | copyedit + last_updatedMarcia Ramos2017-09-281-4/+10
| | | | | | | |
| * | | | | | | add note on DNS propagation timeMarcia Ramos2017-09-281-0/+4
| | | | | | | |
| * | | | | | | add section "Add your custom domain to GitLab Pages settings"Marcia Ramos2017-09-281-4/+24
| | | | | | | |
| * | | | | | | fixes links (html => md)docs-crosslink-pages-guidesMarcia Ramos2017-09-273-3/+3
| | | | | | | |
| * | | | | | | add intro section "Custom domains for GitLab Pages" for comprehensiveness ↵Marcia Ramos2017-09-271-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and SEO
| * | | | | | | update linksMarcia Ramos2017-09-271-1/+3
| | | | | | | |
| * | | | | | | cross-link Pages referencesMarcia Ramos2017-09-271-1/+16
| |/ / / / / /
* | | | | | | Merge branch 'fix-mr-sidebar-counter-after-merge' into 'master'Robert Speicher2017-09-283-0/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear merge requests counter cache after merge Closes gitlab-ee#3573 and #38344 See merge request gitlab-org/gitlab-ce!14563
| * | | | | | | Clear merge requests counter cache after mergeSean McGivern2017-09-283-0/+17
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change, the MR counter in the sidebar would be wrong if an MR had been merged since the last update, but not opened or closed, as merging did not trigger a counter cache update.
* | | | | | | Merge branch 'hashed-storage-migration-path' into 'master'Douwe Maan2017-09-2820-14/+736
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hashed storage migration path Closes gitlab-ee#3118 See merge request gitlab-org/gitlab-ce!14067
| * | | | | | | Add support to migrate existing projects to Hashed Storage asynchashed-storage-migration-pathGabriel Mazetto2017-09-2816-4/+686
| | | | | | | |
| * | | | | | | [Backported from EE] Readonly flag for ProjectsGabriel Mazetto2017-09-285-11/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is used in EE for the storage migration, and we want to use this in CE as well to be able to migrate projects to hashed_storage.
* | | | | | | | Merge branch 'bvl-fix-close-issuable-link' into 'master'Rémy Coutable2017-09-284-11/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use relative paths for opening and closing issuables Closes #35822 See merge request gitlab-org/gitlab-ce!14555
| * | | | | | | | Use relative paths for opening and closing issuablesbvl-fix-close-issuable-linkBob Van Landuyt2017-09-284-11/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The abuse reports need a full issuable URL, but linking to issuables should use the relative paths
* | | | | | | | | Merge branch 'feature/custom-attributes' into 'master'Rémy Coutable2017-09-2823-2/+433
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support custom attributes on users See merge request gitlab-org/gitlab-ce!13038