summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use Go 1.10 for source installationsgo-1.10-source-installsJacob Vosmaer2018-06-192-11/+11
|
* Merge branch 'ce-jej/sanitize-group-saml-relay-state' into 'master'Kamil Trzciński2018-06-152-0/+29
|\ | | | | | | | | [CE backport] Backport InternalRedirect#sanitize_redirect See merge request gitlab-org/gitlab-ce!19795
| * Backport InternalRedirect#sanitize_redirectce-jej/sanitize-group-saml-relay-stateJames Edwards-Jones2018-06-142-0/+29
| |
* | Merge branch '46668-make-the-html-attribute-on-the-blob-json-call-optional' ↵Douwe Maan2018-06-153-6/+26
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Make the html attribute on the blob json call optional" Closes #46668 See merge request gitlab-org/gitlab-ce!19479
| * | Reuse viewer param and move logic to blob controllerDouwe Maan2018-06-154-10/+10
| | |
| * | Changed the query string parameter to a string46668-make-the-html-attribute-on-the-blob-json-call-optionalTim Zallmann2018-06-151-1/+1
| | |
| * | Fixed linting error with trailing space in rbTim Zallmann2018-06-142-2/+2
| | |
| * | Makes the html attribute in the json output optional with the option ↵Tim Zallmann2018-06-143-1/+21
| | | | | | | | | | | | html_render=false
* | | Merge branch 'fix-flakey-remove-deploy-key-spec' into 'master'Rémy Coutable2018-06-151-1/+2
|\ \ \ | | | | | | | | | | | | | | | | Fix flakey time-sensitive remove deploy key spec See merge request gitlab-org/gitlab-ce!19800
| * | | Fix flakey time-sensitive remove deploy key specfix-flakey-remove-deploy-key-specEric Eastwood2018-06-141-1/+2
| | | |
* | | | Merge branch 'docs/fix-indentation-for-current-status-section' into 'master'45933-web-ide-review-stylingMarcia Ramos2018-06-151-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix indentation for 'Current status' section See merge request gitlab-org/gitlab-ce!19884
| * | | | Fix indentation for 'Current status' sectionFabio Busatto2018-06-151-1/+1
|/ / / /
* | | | Merge branch 'docs-assign-ancestor-group-milestones' into 'master'Sean McGivern2018-06-151-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove line regarding future feature of assigning ancestor group milestones See merge request gitlab-org/gitlab-ce!19865
| * | | | Remove line regarding future feature of assigning ancestor group milestonesdocs-assign-ancestor-group-milestonesVictor Wu2018-06-141-1/+0
| | | | |
* | | | | Merge branch 'fix-flakey-user-assignee-autocomplete-dropdown-specs' into ↵Douwe Maan2018-06-151-25/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix flakey time-sensitive user/assignee autocomplete dropdown See merge request gitlab-org/gitlab-ce!19799
| * | | | | Update dropdown_assignee_spec with filtered_search_helpersfix-flakey-user-assignee-autocomplete-dropdown-specsEric Eastwood2018-06-141-19/+18
| | | | | |
| * | | | | Fix flakey user/assignee autocomplete dropdownEric Eastwood2018-06-141-8/+10
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/38664 This previously worked because, it would assert the correct names in the full list and then wait for the list to go blank for the NOT assertion Example failure, https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/74649299
* | | | | Merge branch 'jr-design-artifact-process' into 'master'Douwe Maan2018-06-151-3/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update process to create new design artifact issue See merge request gitlab-org/gitlab-ce!19465
| * | | | | remove plural from 'label'jr-design-artifact-processSarrah Vesselov2018-06-141-1/+1
| | | | | |
| * | | | | Fix design artifact should not be removedJames Ramsay2018-06-141-3/+3
| | | | | |
| * | | | | Increase detailJames Ramsay2018-06-141-5/+11
| | | | | |
| * | | | | Update process to create new design artifact issueJames Ramsay2018-06-061-3/+6
| | | | | |
* | | | | | Merge branch 'safari-scrollbar-bug' into 'master'Phil Hughes2018-06-152-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove scrollbar in Safari in repo settings page Closes #47410 See merge request gitlab-org/gitlab-ce!19809
| * | | | | | Remove scrollbar in Safari in repo settings pagegfyoung2018-06-142-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #47410.
* | | | | | | Merge branch 'jivl-fix-missing-loading-dots-job-logs' into 'master'Clement Ho2018-06-141-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing dots from the CI job log output Closes #47817 See merge request gitlab-org/gitlab-ce!19871
| * | | | | | Fix missing dots from the CI job log outputJose2018-06-141-1/+1
| | | | | | |
* | | | | | | Merge branch 'jivl-fix-create-project-template-buttons' into 'master'Annabel Gray2018-06-144-36/+33
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix use template buttons for creating a new project Closes #47580 See merge request gitlab-org/gitlab-ce!19654
| * | | | | | | Fix template iconsClement Ho2018-06-141-0/+6
| | | | | | | |
| * | | | | | | Remove vertical-alignment from project template buttonsjivl-fix-create-project-template-buttonsJose2018-06-131-2/+4
| | | | | | | |
| * | | | | | | Use d-blockClement Ho2018-06-133-10/+2
| | | | | | | |
| * | | | | | | Fix change template formClement Ho2018-06-133-20/+12
| | | | | | | |
| * | | | | | | Fix use template buttons for creating a new projectJose2018-06-132-11/+16
| | | | | | | |
* | | | | | | | Merge branch '47938-expand-diff' into 'master'Clement Ho2018-06-144-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve ""Click to expand" link in collapsed diffs should be blue" Closes #47938 See merge request gitlab-org/gitlab-ce!19867
| * | | | | | | | Resolve ""Click to expand" link in collapsed diffs should be blue"Annabel Gray2018-06-144-4/+4
|/ / / / / / / /
* | | | | | | | Merge branch '47905-user-tabs-doesn-t-show-spinner' into 'master'Annabel Gray2018-06-141-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "User tabs doesn't show spinner" Closes #47905 See merge request gitlab-org/gitlab-ce!19862
| * | | | | | | | Fix user tabs loading indicatorClement Ho2018-06-141-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch '46699-project-home-buttons' into 'master'Clement Ho2018-06-141-0/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Project homepage > Clone dropdown/input larger than other buttons" Closes #46699 See merge request gitlab-org/gitlab-ce!19726
| * | | | | | | | Resolve "Project homepage > Clone dropdown/input larger than other buttons"Annabel Gray2018-06-141-0/+2
|/ / / / / / / /
* | | | | | | | Merge branch '47850-placeholder-note-renders-the-user-name-in-a-new-line' ↵Annabel Gray2018-06-143-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Placeholder note renders the user name in a new line" Closes #47850 See merge request gitlab-org/gitlab-ce!19791
| * | | | | | | | Resolve "Placeholder note renders the user name in a new line"Clement Ho2018-06-143-5/+5
|/ / / / / / / /
* | | | | | | | Merge branch '47675-strange-layout-for-pipelines-list-view' into 'master'Annabel Gray2018-06-141-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Strange layout for pipelines list view" Closes #47675 and #47858 See merge request gitlab-org/gitlab-ce!19788
| * | | | | | | Fix overflow for pipelines table47675-strange-layout-for-pipelines-list-viewClement Ho2018-06-131-0/+1
| | | | | | | |
* | | | | | | | Merge branch '47646-ui-glitch' into 'master'Clement Ho2018-06-142-0/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "GFM: Color chips UI glitch" Closes #47646 See merge request gitlab-org/gitlab-ce!19687
| * | | | | | | | line-height fixed for color chipsMurat Dogan2018-06-122-0/+6
| | | | | | | | |
* | | | | | | | | Merge branch 'refactor-trigger-build-script' into 'master'Rémy Coutable2018-06-145-172/+184
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the trigger-build script into one location to serve both omnibus and cloud-native triggers. See merge request gitlab-org/gitlab-ce!19837
| * | | | | | | | | Move the trigger-build script into one location to serve both omnibus and ↵refactor-trigger-build-scriptMarin Jankovski2018-06-145-172/+184
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cloud-native triggers.
* | | | | | | | | | Merge branch '47825-gitaly-modal' into 'master'Clement Ho2018-06-147-12/+20
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Performance bar Gitaly modal is hard to read" Closes #47825 See merge request gitlab-org/gitlab-ce!19752
| * | | | | | | | | | Resolve "Performance bar Gitaly modal is hard to read"Annabel Gray2018-06-147-12/+20
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'ux-label-update' into 'master'Clement Ho2018-06-141-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clarify ux label process See merge request gitlab-org/gitlab-ce!19854
| * | | | | | | | | | clarify ux label processux-label-updateSarrah Vesselov2018-06-141-1/+1
| | | | | | | | | | |