summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CookieRestriction helper controlled by feature flagsjej/cookie-restriction-toggled-by-feature-flagJames Edwards-Jones2018-07-102-0/+91
|
* Merge branch ↵Fatih Acet2018-07-022-3/+6
|\ | | | | | | | | | | | | | | | | '6224-extract-ee-specific-files-lines-for-app-views-shared-boards-components' into 'master' Resolve "Extract EE specific files/lines for app/views/shared/boards/components" Closes gitlab-ee#6224 See merge request gitlab-org/gitlab-ce!20292
| * Resolve "Extract EE specific files/lines for app/views/shared/boards/components"Constance Okoghenun2018-07-022-3/+6
|/
* Merge branch 'update-left-side-nav-border' into 'master'Annabel Gray2018-07-021-9/+8
|\ | | | | | | | | | | | | Update left side nav border UI Closes #46222 See merge request gitlab-org/gitlab-ce!19967
| * Update left side nav border UIAndreas Kämmerle2018-07-021-9/+8
|/
* Merge branch 'add-title-placeholder-for-new-issues' into 'master'Annabel Gray2018-07-023-1/+9
|\ | | | | | | | | | | | | Add title placeholder for new issues Closes #48085 See merge request gitlab-org/gitlab-ce!20271
| * Update create issue test to check for input placeholdersGeorge Tsiolis2018-06-291-0/+3
| |
| * Add title placeholder for new issuesGeorge Tsiolis2018-06-292-1/+6
| |
* | Merge branch 'fix-last-commit-author-link-is-blue' into 'master'Annabel Gray2018-07-022-5/+14
|\ \ | | | | | | | | | | | | | | | | | | Fixed last commit author link is blue regression Closes #48251 See merge request gitlab-org/gitlab-ce!20234
| * | Fixed last commit author link is blue regressionConstance Okoghenun2018-07-022-5/+14
|/ /
* | Merge branch 'docs/job-traces' into 'master'Marcia Ramos2018-07-021-64/+91
|\ \ | | | | | | | | | | | | | | | | | | Change path to CI job traces Closes #47173 See merge request gitlab-org/gitlab-ce!19422
| * | Update job_traces.mdMike Lewis2018-06-301-4/+3
| | |
| * | Refactor the job traces admin docsdocs/job-tracesAchilleas Pipinellis2018-06-253-89/+90
| | |
| * | Fix trace documentationShinya Maeda2018-06-251-14/+44
| | |
| * | Change path to CI job tracesAchilleas Pipinellis2018-06-253-6/+3
| | |
* | | Merge branch 'docs/ad-typo' into 'master'Marcia Ramos2018-07-021-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Update index.md changed "gonna" to "going to be" See merge request gitlab-org/gitlab-ce!20310
| * | | Update index.md changed "gonna" to "going to be"joe d2018-07-021-1/+1
| | | |
* | | | Merge branch 'crose-details-on-buildkey' into 'master'Achilleas Pipinellis2018-07-021-2/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add detail around 'Build Key' within the GitLab steps. See merge request gitlab-org/gitlab-ce!20219
| * | | | Add detail around 'Build Key' within the GitLab steps. Chris Rose2018-06-271-2/+1
| | | | |
* | | | | Merge branch 'update-external-link-icon-in-merge-request-widget' into 'master'Phil Hughes2018-07-023-5/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update external link icon in merge request widget See merge request gitlab-org/gitlab-ce!20154
| * | | | | Update external link icon in merge request widgetGeorge Tsiolis2018-06-273-5/+15
| | | | | |
* | | | | | Merge branch ↵Nick Thomas2018-07-023-26/+49
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '6195-http-git-push-to-secondary-for-git-lfs-currently-does-not-work' into 'master' Prep work to support git/git-lfs redirect to primary See merge request gitlab-org/gitlab-ce!19728
| * | | | | | Move check logic into #batch_operation_disallowed?Ash McKenzie2018-07-021-1/+6
| | | | | | |
| * | | | | | Better route matching for read-only detectionAsh McKenzie2018-07-022-25/+43
| | | | | | |
* | | | | | | Merge branch 'ce-backport-5605-epic-autocomplete' into 'master'Phil Hughes2018-07-0211-12/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Backport: Add support for autocompleting Epics within Issues & MRs and Labels within Epics See merge request gitlab-org/gitlab-ce!20238
| * | | | | | | Update tests to check emoji autocompletionKushal Pandya2018-07-025-10/+10
| | | | | | | |
| * | | | | | | Add `&` support for epics autocompletionKushal Pandya2018-07-026-2/+14
| | | | | | | |
* | | | | | | | Merge branch '48653-mr-target-branch-missing' into 'master'Sean McGivern2018-07-023-9/+32
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix notify_conflict? raising exception due to absent branches Closes #48653 See merge request gitlab-org/gitlab-ce!20280
| * | | | | | | Fix notify_conflict? raising exception when branches do not existMark Chao2018-07-023-9/+32
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | repository.can_be_merged? can raise error if diff_head_sha or target_branch are absent, therefore check those explicitly.
* | | | | | | Merge branch 'bvl-externalize-singular-docs' into 'master'Achilleas Pipinellis2018-07-021-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add note for variable usage in singular See merge request gitlab-org/gitlab-ce!20286
| * | | | | | | [DOC] Add note for variable usage in singularBob Van Landuyt2018-06-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoiding a count variable allows more natural translation in some languages.
* | | | | | | | Merge branch 'dm-emoji-filtter-comment' into 'master'Sean McGivern2018-07-021-4/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove outdated comment from emoji_filter.rb See merge request gitlab-org/gitlab-ce!20306
| * | | | | | | | Remove outdated comment from emoji_filter.rbDouwe Maan2018-07-021-4/+0
|/ / / / / / / /
* | | | | | | | Merge branch 'dm-user-without-projects-performance' into 'master'Yorick Peterse2018-07-022-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of User.without_projects scope Closes #48577 See merge request gitlab-org/gitlab-ce!20264
| * | | | | | | | Improve performance of User.without_projects scopeDouwe Maan2018-07-022-1/+6
| | | | | | | | |
* | | | | | | | | Merge branch 'update-installation-11-1' into 'master'James Lopez2018-07-022-3/+364
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update installation and update guides for 11.1 See merge request gitlab-org/gitlab-ce!20299
| * | | | | | | | | Update installation and update guides for 11.1Alessio Caiazza2018-07-022-3/+364
|/ / / / / / / / /
* | | | | | | | | Merge branch '39543-milestone-page-list-redesign' into 'master'Fatih Acet2018-07-0210-87/+96
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Milestone page list redesign" Closes #39543 See merge request gitlab-org/gitlab-ce!19832
| * | | | | | | | | Adujsted the height of milestone status on milestones list on mobileConstance Okoghenun2018-06-292-3/+8
| | | | | | | | | |
| * | | | | | | | | Adjusted styling of milestone projects in milestone listConstance Okoghenun2018-06-282-1/+2
| | | | | | | | | |
| * | | | | | | | | Fixed alignment of milestone status and projects in milestone list39543-milestone-page-list-redesignConstance Okoghenun2018-06-252-10/+11
| | | | | | | | | |
| * | | | | | | | | Updated stlying of title and date range of milestone listConstance Okoghenun2018-06-253-4/+2
| | | | | | | | | |
| * | | | | | | | | Added spacing between milestone list and tabsConstance Okoghenun2018-06-251-0/+1
| | | | | | | | | |
| * | | | | | | | | Updated test for promoted milestones success messageConstance Okoghenun2018-06-211-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Constance Okoghenun2018-06-21920-5542/+13115
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 39543-milestone-page-list-redesign
| * | | | | | | | | | Added changelog entryConstance Okoghenun2018-06-211-0/+5
| | | | | | | | | | |
| * | | | | | | | | | Added changelog entryConstance Okoghenun2018-06-211-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Updated the styling of milestone projects in groups milestone listConstance Okoghenun2018-06-212-2/+3
| | | | | | | | | | |
| * | | | | | | | | | Added underline to promoted milestone flash messageConstance Okoghenun2018-06-211-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Updated the font-size of milestone status in milestone listConstance Okoghenun2018-06-211-0/+4
| | | | | | | | | | |