summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Replaced external link button with doc-text icon59034-external-link-buttonDenys Mishunov2019-04-152-1/+6
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59034
* Merge branch 'sh-disable-postgresql-fsync-ci' into 'master'Kamil Trzciński2019-04-151-4/+6
|\ | | | | | | | | | | | | Disable PostgreSQL fsync for faster CI Closes #60435 See merge request gitlab-org/gitlab-ce!27295
| * Turn off database durability settings in CIsh-disable-postgresql-fsync-ciStan Hu2019-04-121-4/+6
| | | | | | | | | | | | As described in https://www.postgresql.org/docs/current/non-durability.html, we can save money and time by disabling durability in tests.
* | Merge branch '60480-rescue-build-preparing-errors' into 'master'Kamil Trzciński2019-04-152-4/+20
|\ \ | | | | | | | | | | | | | | | | | | Rescue and log errors raised when preparing builds Closes #60480 See merge request gitlab-org/gitlab-ce!27351
| * | Rescue and log errors raised when preparing builds60480-rescue-build-preparing-errorsTiger2019-04-152-4/+20
| | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/60480
* | | Merge branch 'frozen_string_literal_qa' into 'master'Sanad Liaquat2019-04-1598-1/+198
|\ \ \ | |/ / |/| | | | | | | | Add frozen_string_literal to qa/ See merge request gitlab-org/gitlab-ce!27266
| * | Add frozen_string_literal to qa/frozen_string_literal_qaThong Kuah2019-04-1398-1/+198
| | | | | | | | | | | | | | | This will be default in Ruby 3, so will be good to apply in QA ahead of time to be consistent.
* | | Merge branch '31331-add-time-tracking-issue-boards-sidebar' into 'master'Tim Zallmann2019-04-127-13/+63
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add time tracking information to Issue Boards sidebar Closes #31331 See merge request gitlab-org/gitlab-ce!27166
| * | | Add changelog entry31331-add-time-tracking-issue-boards-sidebarKushal Pandya2019-04-121-0/+5
| | | |
| * | | Add time tracking information to Issue Boards sidebarKushal Pandya2019-04-126-13/+58
| |/ / | | | | | | | | | Add time tracking progress bar to Issue Boards sidebar.
* | | Merge branch 'fix-protected_branches_spec-master' into 'master'60477-docs-feedback-emoji-pictures-are-brokenMichael Kozono2019-04-121-1/+1
|\ \ \ | | | | | | | | | | | | | | | | CE Fix protected branch example failing on master See merge request gitlab-org/gitlab-ce!27332
| * | | Fix protected branch example failing on masterfix-protected_branches_spec-masterLuke Bennett2019-04-121-1/+1
| | | | | | | | | | | | | | | | Failing due to updates in capybara and selenium driver.
* | | | Merge branch 'sh-revert-untrusted-chrome-repo' into 'master'Douglas Barbosa Alexandre2019-04-121-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Revert "Merge branch 'sh-allow-unauth-chrome' into 'master'" See merge request gitlab-org/gitlab-ce!27329
| * | | Revert "Merge branch 'sh-allow-unauth-chrome' into 'master'"sh-revert-untrusted-chrome-repoStan Hu2019-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 026c92d5fa82fac87386d5691c3d5b1e02f2eb5e, reversing changes made to 8cda9d33a96e34c3809dcaddcde2619cc4923c0b.
* | | | Merge branch ↵Fatih Acet2019-04-122-1/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '60369-border-radius-still-showing-up-after-improve-diff-nav-header-was-finished' into 'master' Breakpoints.isDesktop should not always return false Closes #60369 See merge request gitlab-org/gitlab-ce!27240
| * | | | Fix isDesktop function to return proper valueSam Bigelow2019-04-122-1/+15
| | | | |
* | | | | Merge branch '11124-update-deployment-service-fails-if-project-is-nil' into ↵Stan Hu2019-04-123-11/+33
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Always return the deployment in the UpdateDeploymentService#execute method Closes gitlab-ee#11124 See merge request gitlab-org/gitlab-ce!27322
| * | | | Add CHANGELOG entryDouglas Barbosa Alexandre2019-04-121-0/+5
| | | | |
| * | | | Always return the deployment in the execute methodDouglas Barbosa Alexandre2019-04-122-11/+28
| | | | |
* | | | | Merge branch 'add-to-docs-info-about-moving-migrations' into 'master'Marcia Ramos2019-04-121-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add information about moving migrations See merge request gitlab-org/gitlab-ce!27159
| * | | | | Add information about moving migrationsGosia Ksionek2019-04-121-0/+6
|/ / / / / | | | | | | | | | | | | | | | | | | | | Add to docs paragraph about a way of moving EE migrations to CE if needed
* | | | | Merge branch 'frozen_string_literal_spec_services' into 'master'Michael Kozono2019-04-12233-0/+466
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add frozen_string_literal to spec/services See merge request gitlab-org/gitlab-ce!27267
| * | | | | Add frozen_string_literal to spec/servicesfrozen_string_literal_spec_servicesThong Kuah2019-04-12233-0/+466
| | | | | | | | | | | | | | | | | | | | | | | | Probably useful as we often move these files to "new" files.
* | | | | | Merge branch 'gt-fix-styling-for-framework-notes' into 'master'Phil Hughes2019-04-1210-21/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix styling for `app/assets/stylesheets/framework/notes.scss` Closes #59868 See merge request gitlab-org/gitlab-ce!26877
| * | | | | | Rename selector for framework notesGeorge Tsiolis2019-04-1210-21/+21
| | | | | | |
* | | | | | | Merge branch ↵Clement Ho2019-04-125-0/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '57318-track-discussion-thread-usage-on-gitlab-com-with-snowplow' into 'master' CE backport of Added Snowplow tracking to notes Closes #57318 See merge request gitlab-org/gitlab-ce!25899
| * | | | | | | CE backport of Add Snowplow tracking to notesConstance Okoghenun2019-04-125-0/+27
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bacport of Snowplow tracking for - Reply comment button - Start discussion and Comment buttons
* | | | | | | Merge branch 'docs-for-pages-inplace-chroot-limitation' into 'master'Marcia Ramos2019-04-121-0/+4
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Docs for pages inplace chroot limitation See merge request gitlab-org/gitlab-ce!27250
| * | | | | | Docs for pages inplace chroot limitationdocs-for-pages-inplace-chroot-limitationShinya Maeda2019-04-111-0/+4
| | | | | | |
* | | | | | | Merge branch '60241-merge-request-popover-doesn-t-go-away-on-mouse-leave' ↵Phil Hughes2019-04-123-1/+40
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Merge Request popover doesn't go away on mouse leave" Closes #60241 See merge request gitlab-org/gitlab-ce!27143
| * | | | | | Fix bug where MR Popover wont go away60241-merge-request-popover-doesn-t-go-away-on-mouse-leaveSam Bigelow2019-04-123-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a check to make sure eventListener is not added twice
* | | | | | | Merge branch 'fe-remove-slugify' into 'master'Filipa Lacerda2019-04-122-13/+0
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Remove slugify text utility See merge request gitlab-org/gitlab-ce!27290
| * | | | | | Remove slugify text utilityfe-remove-slugifyPaul Slaughter2019-04-122-13/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Why?** This function was not being used and it's documentation was out of date.
* | | | | | Merge branch '59841-show-commits' into 'master'Phil Hughes2019-04-122-6/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces CSS with utility class See merge request gitlab-org/gitlab-ce!27311
| * | | | | | Replaces CSS with utility class59841-show-commitsFilipa Lacerda2019-04-122-6/+1
| | | | | | |
* | | | | | | Merge branch 'update-capybara' into 'master'Stan Hu2019-04-127-42/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update capybara and selenium-webdriver See merge request gitlab-org/gitlab-ce!27201
| * | | | | | | Also update nokogiri for QALin Jen-Shin2019-04-121-1/+1
| | | | | | | |
| * | | | | | | Fix a few specs after updating capybara and selenium-webdriverRémy Coutable2019-04-124-27/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Update capybara and selenium-webdriverRémy Coutable2019-04-122-14/+14
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'fix-typo-activity-lease' into 'master'Stan Hu2019-04-122-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Fix typo in activity lease See merge request gitlab-org/gitlab-ce!27288
| * | | | | | Fix typo in activity leasefix-typo-activity-leaseCindy Pallares2019-04-112-2/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'id-undefined-pages-for-wiki-page' into 'master'Douwe Maan2019-04-122-4/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix grouping wiki pages by directory See merge request gitlab-org/gitlab-ce!27294
| * | | | | | Fix grouping wiki pages by directoryIgor2019-04-122-4/+8
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a page has the same name as a directory the WikiPage#group_by_directory method can have a wrong behaviour This commit fixes it
* | | | | | Merge branch 'refactor_cluster_application_services' into 'master'Kamil Trzciński2019-04-126-31/+42
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor cluster application services See merge request gitlab-org/gitlab-ce!27191
| * | | | | | Do not rescue errors from state transitionsThong Kuah2019-04-126-31/+42
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As this are un-expected errors which we should hear about from Sentry. Still rescue StandardError when operating a Helm action as we can get non Kubeclient errors such as SSL certificate or network errors
* | | | | | Merge branch '59925-reports' into 'master'Phil Hughes2019-04-121-5/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes unused CSS in reports Closes #59925 See merge request gitlab-org/gitlab-ce!27310
| * | | | | | Removes unused CSSFilipa Lacerda2019-04-121-5/+0
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '59921-pipeline-schedule' into 'master'Phil Hughes2019-04-123-9/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces CSS with BS4 utility class Closes #59921 See merge request gitlab-org/gitlab-ce!27309
| * | | | | | Replaces CSS with BS4 utility classFilipa Lacerda2019-04-123-9/+9
| |/ / / / /
* | | | | | Merge branch 'mw-i18n-app-models' into 'master'Nick Thomas2019-04-1221-95/+377
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings in app/models See merge request gitlab-org/gitlab-ce!27207