summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Turn commit sha in monitor charts popover to link11888-regression-deploy-correlation-markers-on-monitoring-graphs-not-clickableDhiraj Bodicherla2019-06-264-6/+29
| | | | | | Commit sha in deployment popovers within monitoring dashboard are not clickable or selectable. This commit makes those commit sha links selectable and point to projects commit page
* Merge branch 'rj-fix-spec' into 'master'29756-meta-prioritize-ie11-edge-testing-same-as-regular-browser-testing-for-features-and-bug-fixes-that-we-shipThong Kuah2019-06-261-9/+16
|\ | | | | | | | | Use relative position to order issues See merge request gitlab-org/gitlab-ce!30095
| * Properly check that issue list has persistedStan Hu2019-06-261-0/+16
| | | | | | | | | | A valid user needs to be signed in, and we need to reload the page to verify that the issue list was saved on the backend.
| * Use relative position to order issuesrj-fix-specRajat Jain2019-06-261-13/+4
| |
* | Merge branch '63247-add-conf-toast-and-link' into 'master'Mike Greiling2019-06-2611-51/+147
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Including a link to the posted comment for visual review app review feature" Closes #63247 See merge request gitlab-org/gitlab-ce!29719
| * | Basic note appearsSarah Groff Hennigh-Palermo2019-06-2611-51/+147
|/ / | | | | | | This happens in multiple files
* | Merge branch 'i18n-access_tokens-of-user-profile' into 'master'Fatih Acet2019-06-266-43/+145
|\ \ | | | | | | | | | | | | Externalize strings of access tokens page in user profile See merge request gitlab-org/gitlab-ce!28635
| * | Externalize strings of access tokens page in user profileantony liu2019-06-266-43/+145
|/ /
* | Merge branch '59974-multidash' into 'master'Fatih Acet2019-06-2610-15/+160
|\ \ | | | | | | | | | | | | | | | | | | Load dashboards from project's git repository Closes #59974 See merge request gitlab-org/gitlab-ce!29348
| * | Add feature flag and dashboard endpointSimon Knox2019-06-2610-15/+160
|/ / | | | | | | | | | | First part of FE for Prometheus API Dashboard endpoint fetches all info except for chart results Renders empty groups after loading
* | Merge branch '62765-add-jquery-to-jest-setup' into 'master'Mike Greiling2019-06-261-0/+6
|\ \ | | | | | | | | | | | | Add jQuery in jest test_setup See merge request gitlab-org/gitlab-ce!30100
| * | Add jQuery to jest test_setupPaul Slaughter2019-06-261-0/+6
| | |
* | | Merge branch 'refactor/remove-sentry-from-app-settings' into 'master'Stan Hu2019-06-2620-194/+64
|\ \ \ | |_|/ |/| | | | | | | | Remove Sentry settings from application settings See merge request gitlab-org/gitlab-ce!28447
| * | refactor(db): remove Sentry from application settings, disable_ddl_transactionRoger Meier2019-06-251-0/+2
| | |
| * | refactor(db): remove Sentry from application settingsRoger Meier2019-06-252-5/+1
| | |
| * | refactor: remove Sentry from application settingsRoger Meier2019-06-2519-189/+61
| | |
* | | Update CHANGELOG.md for 11.11.4GitLab Release Tools Bot2019-06-261-0/+9
| | | | | | | | | [ci skip]
* | | Merge branch '62938-wcag-aa-edited-text-color' into 'master'Phil Hughes2019-06-263-4/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use darker gray color for system note metadata and edited text Closes #62938 See merge request gitlab-org/gitlab-ce!30054
| * | | Use darker gray color for system note metadata and edited text62938-wcag-aa-edited-text-colorAnnabel Dunstone Gray2019-06-253-4/+9
| | | |
* | | | Merge branch 'vue-tree-logs-tree-request' into 'master'Filipa Lacerda2019-06-2613-9/+293
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fetch commit message with logs_tree endpoint See merge request gitlab-org/gitlab-ce!29796
| * | | | Fetch commit message with log_tree endpointPhil Hughes2019-06-2513-9/+293
| | | | |
* | | | | Merge branch '12426-modal-store-spec' into 'master'Phil Hughes2019-06-261-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for spec/frontend/boards/modal_store_spec.js Closes gitlab-ee#12426 See merge request gitlab-org/gitlab-ce!30084
| * | | | | Removes EE differences12426-modal-store-specFilipa Lacerda2019-06-261-1/+1
| | | | | |
* | | | | | Merge branch '12428-pipelines' into 'master'Phil Hughes2019-06-261-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for app/assets/javascripts/pipelines/pipeline_details_mediator.js Closes gitlab-ee#12428 See merge request gitlab-org/gitlab-ce!30085
| * | | | | | Removes EE differences12428-pipelinesFilipa Lacerda2019-06-261-1/+1
| | | | | | |
* | | | | | | Merge branch 'rj-fix-master' into 'master'Jan Provaznik2019-06-261-2/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stub manual_sorting flag Closes #63756 See merge request gitlab-org/gitlab-ce!30089
| * | | | | | | Stub manual_sorting flagrj-fix-masterRajat Jain2019-06-261-2/+8
| | | | | | | |
* | | | | | | | Merge branch 'docs-pages-force-https' into 'master'Achilleas Pipinellis2019-06-261-14/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: document "force https" for Pages Closes #45569 and #49233 See merge request gitlab-org/gitlab-ce!30049
| * | | | | | | | Docs: document "force https" for PagesMarcia Ramos2019-06-261-14/+25
|/ / / / / / / /
* | | | | | | | Merge branch 'always-display-environment-selector' into 'master'Phil Hughes2019-06-265-48/+123
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always display environment selector in Metrics dashboard See merge request gitlab-org/gitlab-ce!29705
| * | | | | | | | Always display environment selectorReuben Pereira2019-06-265-48/+123
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the metrics dashboard, always display the environment selector, even if there is no data to display for that environment. This allows the user to switch to the metrics dashboard of another environment.
* | | | | | | | Merge branch '58802-rename-webide' into 'master'Phil Hughes2019-06-2612-26/+133
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Re-name files in Web IDE in a more natural way" Closes #58802 See merge request gitlab-org/gitlab-ce!29948
| * | | | | | | | Re-name entries in one commitDenys Mishunov2019-06-2612-26/+133
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update window's URL after entry's re-name Set proper hook for correct fileLanguage Filtered out `moved` entries from the tree
* | | | | | | | Merge branch '12257-sidebar-mediator' into 'master'Phil Hughes2019-06-261-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for app/assets/javascripts/sidebar/sidebar_mediator.js Closes gitlab-ee#12257 See merge request gitlab-org/gitlab-ce!30077
| * | | | | | | | Removes EE differences12257-sidebar-mediatorFilipa Lacerda2019-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses ee_else_ce to remove the differences
* | | | | | | | | Merge branch 'sh-cache-negative-entries-find-commit' into 'master'Douglas Barbosa Alexandre2019-06-263-18/+40
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow caching of negative FindCommit matches See merge request gitlab-org/gitlab-ce!29952
| * | | | | | | | | Allow caching of negative FindCommit matchessh-cache-negative-entries-find-commitStan Hu2019-06-253-18/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When FindCommit ref caching is enabled, negative matches would previously not be cached. However, if a source branch is deleted, there's no need to keep looking up the same commit. This change caches the result of a nil commit.
* | | | | | | | | | Merge branch '12427-comparision-pane' into 'master'Phil Hughes2019-06-261-3/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for `app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue` Closes gitlab-ee#12427 See merge request gitlab-org/gitlab-ce!30078
| * | | | | | | | | | Removes EE differences12427-comparision-paneFilipa Lacerda2019-06-261-3/+0
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '12364-sortable-default-mixin' into 'master'Phil Hughes2019-06-261-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for sortable_default_options Closes gitlab-ee#12364 See merge request gitlab-org/gitlab-ce!30074
| * | | | | | | | | | Removes EE differences12364-sortable-default-mixinFilipa Lacerda2019-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uses ee_else_ce to remove ee differences
* | | | | | | | | | | Merge branch 'jprovazn-internal-id-spec' into 'master'Stan Hu2019-06-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix failing spec/models/internal_id_spec.rb spec Closes #63698 See merge request gitlab-org/gitlab-ce!30027
| * | | | | | | | | | Fix failing spec/models/internal_id_spec.rb specJan Provaznik2019-06-261-1/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The spec is too strict about how many `current_version` should be called - if the spec is called separately, it's called 3 times, if all specs run it's called twice. This is similar to the change done in 9b752791624ce618810b9d65251582e56c37dee7
* | | | | | | | | | Merge branch 'docs-update-img-guidelines' into 'master'Mike Lewis2019-06-261-6/+15
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: require release version in image filenames Closes #61027 See merge request gitlab-org/gitlab-ce!29713
| * | | | | | | | | | Docs: require release version in image filenamesMarcia Ramos2019-06-261-6/+15
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'mc/bump/update-codquality-version' into 'master'Grzegorz Bizon2019-06-261-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Code Quality version Closes gitlab-ee#12408 See merge request gitlab-org/gitlab-ce!30056
| * | | | | | | | | | Bump Code Quality versionmc/bump/update-codquality-versionMatija Čupić2019-06-251-1/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'quarantine-flaky-user-signup-spec' into 'master'Kushal Pandya2019-06-261-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quarantine flaky spec See merge request gitlab-org/gitlab-ce!30076
| * | | | | | | | | | Quarantine flaky specThong Kuah2019-06-261-1/+1
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/63750
* | | | | | | | | | Merge branch '63710-fix-redis-namespace-warning' into 'master'Nick Thomas2019-06-261-1/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trigger flushdb in a way that redis-namespace is happy with Closes #63710 See merge request gitlab-org/gitlab-ce!30039