summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | Update import screenshot without LFS warningjr-6382-lfs-import-docsJames Ramsay2018-06-111-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for LFS object import was added by gitlab-org/gitlab-ce!18871 and should be reflected in the documentation.
* | | | | | | | | | | | | | | | | Merge branch 'bvl-fix-maintainer-push-rejected' into 'master'Douwe Maan2018-06-124-4/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes rejected pushes from maintainers Closes #46337 See merge request gitlab-org/gitlab-ce!18968
| * | | | | | | | | | | | | | | | | Fixes rejected pushes from maintainersbvl-fix-maintainer-push-rejectedBob Van Landuyt2018-06-114-4/+36
| | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before the push git would make a call to `/:namespace/:project/git-receive-pack`. This would perform an access check without a ref. So the `Project#branch_allows_maintainer_push?` would return false. This adjusts `Project#branch_allows_maintainer_push?` to return true when passing no branch name if there are merge requests open that would allow the user to push. The actual check then happens when a call to `/api/v4/internal/allowed` is made from a git hook.
* | | | | | | | | | | | | | | | | Merge branch 'docs-coached-20180608-1' into 'master'Achilleas Pipinellis2018-06-121-13/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed/enhanced command-line documentation See merge request gitlab-org/gitlab-ce!19589
| * | | | | | | | | | | | | | | | | fixed/enhanced command-line documentationEdwin Torres2018-06-121-13/+45
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'blackst0ne-update-gemfile-rails5-lock' into 'master'Rémy Coutable2018-06-121-19/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Rails5] Update Gitlab.rails5.lock See merge request gitlab-org/gitlab-ce!19681
| * | | | | | | | | | | | | | | | [Rails5] Update Gitlab.rails5.lockblackst0ne-update-gemfile-rails5-lockblackst0ne2018-06-121-19/+19
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'fix-input-placeholder-color' into 'master'Annabel Gray2018-06-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix input placeholder text color Closes #47645 See merge request gitlab-org/gitlab-ce!19633
| * | | | | | | | | | | | | | | | Fix input placeholder text colorfix-input-placeholder-colorAndreas Kämmerle2018-06-111-1/+1
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch ↵Annabel Gray2018-06-122-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '47687-milestone-and-labels-dropdowns-are-misplaced-with-collapsed-sidebar' into 'master' Resolve "Milestone and labels dropdowns are misplaced with collapsed sidebar" Closes #47687 See merge request gitlab-org/gitlab-ce!19666
| * | | | | | | | | | | | | | | | Resolve "Milestone and labels dropdowns are misplaced with collapsed sidebar"47687-milestone-and-labels-dropdowns-are-misplaced-with-collapsed-sidebarClement Ho2018-06-112-4/+4
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jivl-fix-import-gitlab-project-page' into 'master'Annabel Gray2018-06-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: New project > Import gitlab.com project page Closes #47357 See merge request gitlab-org/gitlab-ce!19656
| * | | | | | | | | | | | | | | | | fix styling of the gitlab import pageJose2018-06-111-1/+1
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch '47245-hr-avatar' into 'master'Clement Ho2018-06-111-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "avatar settings page hr is misbehaving" Closes #47245 See merge request gitlab-org/gitlab-ce!19667
| * | | | | | | | | | | | | | | | | Hide overflow on hrAnnabel Dunstone Gray2018-06-111-0/+4
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch '47604-avatars-and-system-icons-for-mobile' into 'master'Clement Ho2018-06-112-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avatars and system icons on left of notes are shown on mobile Closes #47604 See merge request gitlab-org/gitlab-ce!19585
| * | | | | | | | | | | | | | | | | Make avatars/icons hidden on mobileTakuya Noguchi2018-06-082-2/+7
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch '47522-revert-mr-modal' into 'master'Annabel Gray2018-06-112-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Revert MR modal box is too smal after BS4" Closes #47522 See merge request gitlab-org/gitlab-ce!19603
| * | | | | | | | | | | | | | | | | | Remove .row and .col-sm-12Clement Ho2018-06-111-9/+8
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fix styling of revert MR modaltauriedavis2018-06-082-4/+5
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jivl-fix-collapse-sidebar-button-color' into 'master'Clement Ho2018-06-111-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix collapse sidebar button color Closes #47354 See merge request gitlab-org/gitlab-ce!19662
| * | | | | | | | | | | | | | | | | | | Fix collapse sidebar button colorJose2018-06-111-0/+8
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch '47338-sign-in-btn' into 'master'Clement Ho2018-06-114-11/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment of sign in/sign up button Closes #47338 See merge request gitlab-org/gitlab-ce!19587
| * | | | | | | | | | | | | | | | | | Fix alignment of sign in/sign up buttonAnnabel Dunstone Gray2018-06-084-11/+7
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'correct-gray-600' into 'master'Annabel Gray2018-06-111-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update $theme-gray-600 and $gl-text-color-tertiary values according to Design System Closes #47645 See merge request gitlab-org/gitlab-ce!19631
| * | | | | | | | | | | | | | | | | | Update theme-gray-600 and gl-text-color-tertiaryAndreas Kämmerle2018-06-111-2/+2
| | |_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'jivl-fix-merge-request-contribution-aligment' into 'master'Annabel Gray2018-06-111-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix contribution section aligment Closes #47606 See merge request gitlab-org/gitlab-ce!19592
| * | | | | | | | | | | | | | | | | | Fix contribution section aligmentJose2018-06-081-3/+3
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch '47479-add-ssh-key-message-is-hard-to-read' into 'master'Annabel Gray2018-06-111-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add SSH key message is hard to read" Closes #47479 and gitlab-ee#6211 See merge request gitlab-org/gitlab-ce!19579
| * | | | | | | | | | | | | | | | | | | Removes the border-radius from the alertssamdbeckham2018-06-111-0/+1
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Sets the colors and link colors in alerts/noticessamdbeckham2018-06-111-7/+9
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Adds the white color back to the alret bannerssamdbeckham2018-06-081-1/+6
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jivl-fix-padding-commit-info' into 'master'Annabel Gray2018-06-112-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix padding in commit info Closes #47278 See merge request gitlab-org/gitlab-ce!19435
| * | | | | | | | | | | | | | | | | | | fix padding in commit infoJose2018-06-112-1/+5
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'sh-relax-project-import-spec' into 'master'Mayra Cabrera2018-06-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relax expectation in spec/models/project_spec.rb See merge request gitlab-org/gitlab-ce!19663
| * | | | | | | | | | | | | | | | | | Relax expectation in spec/models/project_spec.rbStan Hu2018-06-111-1/+1
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple Sidekiq workers can run in the spec, causing `Project.find` to be run in different places. Instead of setting a fixed number of calls, just use `allow`.
* | | | | | | | | | | | | | | | | | Merge branch 'sh-github-importer-improve-error' into 'master'James Lopez2018-06-111-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitHub Rake importer: Fail with a clearer explanation if GitLab username is wrong See merge request gitlab-org/gitlab-ce!19653
| * | | | | | | | | | | | | | | | | | GitHub Rake importer: Fail with a clearer explanation if GitLab username is ↵Stan Hu2018-06-111-1/+4
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrong
* | | | | | | | | | | | | | | | | | Merge branch '46708-page-numbers' into 'master'Clement Ho2018-06-112-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Fix color of page numbers" Closes #46708 See merge request gitlab-org/gitlab-ce!19599
| * | | | | | | | | | | | | | | | | | Override BS4 pagination variablesAnnabel Dunstone Gray2018-06-082-0/+24
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'unify-uploaders-objects_storage.rb' into 'master'Robert Speicher2018-06-111-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify from EE for app/uploaders/object_storage.rb See merge request gitlab-org/gitlab-ce!19660
| * | | | | | | | | | | | | | | | | | Unify from EE for app/uploaders/object_storage.rbLin Jen-Shin2018-06-121-2/+2
| | |_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'unify-http_status.js' into 'master'Clement Ho2018-06-111-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add NOT_FOUND: 404 to http_status.js from EE See merge request gitlab-org/gitlab-ce!19659
| * | | | | | | | | | | | | | | | | | Add NOT_FOUND: 404 from EELin Jen-Shin2018-06-121-0/+1
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'sh-expire-content-cache-after-import' into 'master'Mayra Cabrera2018-06-118-14/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expire Wiki content cache after importing a repository Closes #47546 See merge request gitlab-org/gitlab-ce!19617
| * | | | | | | | | | | | | | | | | Fix Rubocop failure in spec/models/project_spec.rbStan Hu2018-06-111-1/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Work around limitations of expect_any_instance_of by stubbing Project.findStan Hu2018-06-113-9/+23
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Expire Wiki content cache after importing a repositoryStan Hu2018-06-116-5/+9
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cache state for Wikis that were imported via GitHub or Bitbucket does not appear to have been flushed after a successful import. Closes #47546
* | | | | | | | | | | | | | | | | Merge branch 'sh-admin-gitaly-server-fix' into 'master'Clement Ho2018-06-112-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert extra CSS causing Gitaly Servers table to be misalgined Closes #47648 See merge request gitlab-org/gitlab-ce!19623
| * | | | | | | | | | | | | | | | Fix translation placeholder for Gitaly addressStan Hu2018-06-102-1/+4
| | | | | | | | | | | | | | | | |