summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Fixed Prettier Config Applying + Updated Prettier to newest versionTim Zallmann2018-06-153-36/+24
| | | | | | | | |
* | | | | | | | | Merge branch 'enable-no-restricted-globals' into 'master'Phil Hughes2018-06-1542-53/+55
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable no-restricted-globals in JS files See merge request gitlab-org/gitlab-ce!19877
| * | | | | | | | | Enable no-restricted-globals in JS filesgfyoung2018-06-1542-53/+55
|/ / / / / / / / /
* | | | | | | | | Merge branch 'ce-6145-extract-app-views-shared-issuable-3' into 'master'Robert Speicher2018-06-152-2/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE: Resolve 3 "Extract EE specific files/lines for app/views/shared/issuable" See merge request gitlab-org/gitlab-ce!19777
| * | | | | | | | | Unify app/views/shared/issuable/form/_metadata.html.hamlce-6145-extract-app-views-shared-issuable-3Lin Jen-Shin2018-06-141-1/+4
| | | | | | | | | |
| * | | | | | | | | Unify app/views/shared/issuable/_sidebar_assignees.html.hamlLin Jen-Shin2018-06-141-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch '47915-badges' into 'master'Clement Ho2018-06-153-4/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Long labels names result in overflowing their description block under the Labels page" Closes #47915 See merge request gitlab-org/gitlab-ce!19868
| * | | | | | | | | | Fix specsClement Ho2018-06-151-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Truncate long label names47915-badgesAnnabel Dunstone Gray2018-06-142-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'blackst0ne-rails5-fix-optimistic-lock-values' into 'master'Yorick Peterse2018-06-152-52/+64
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Rails5] Fix optimistic lock value Closes #47961 See merge request gitlab-org/gitlab-ce!19878
| * | | | | | | | | | | [Rails5] Fix optimistic lock valueblackst0ne2018-06-152-52/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the monkey-patch to make it work in Rails 5.
* | | | | | | | | | | | Merge branch 'fix-flakey-move-slash-command-unauthorized-project' into 'master'Robert Speicher2018-06-151-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix flakey time-sensitive move slash command with unauthorized project Closes #47936 See merge request gitlab-org/gitlab-ce!19793
| * | | | | | | | | | | | Fix flakey move slash command with unauthorized projectfix-flakey-move-slash-command-unauthorized-projectEric Eastwood2018-06-141-1/+3
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'fix_google_oauth_docs' into 'master'Achilleas Pipinellis2018-06-151-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update google.md to reflect need for Google+ API for oauth integration; Closes #44685 See merge request gitlab-org/gitlab-ce!18610
| * | | | | | | | | | | | Update google.md to reflect need for Google+ API for oauth integration;Tom Downes2018-05-021-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clarify need for Kubernetes Engine API is only necessary for CI/CD integration with GKE
* | | | | | | | | | | | | Merge branch 'rails5-fix-47836' into 'master'Yorick Peterse2018-06-153-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails5 fix passing Group objects array into for_projects_and_groups milestone scope Closes #47836 See merge request gitlab-org/gitlab-ce!19863
| * | | | | | | | | | | | | Rails5 fix passing Group objects array into for_projects_and_groups ↵Jasper Maes2018-06-143-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | milestone scope
* | | | | | | | | | | | | | Merge branch 'bvl-graphql-nested-merge-request' into 'master'Douwe Maan2018-06-1512-108/+107
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose single merge request within a project GraphQL query See merge request gitlab-org/gitlab-ce!19853
| * | | | | | | | | | | | | | Allow querying a single MR within a projectBob Van Landuyt2018-06-1512-108/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the user to get a single MR nested in a GraphQL project query. Since we need the full path and the iid anyway, this makes more sense than having a root query that needs the full path as well.
| * | | | | | | | | | | | | | Correct the type of the `MergeRequestResolver`.Bob Van Landuyt2018-06-141-1/+1
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was overridden in the fields where this resolver was used. So this change is purely cosmetic.
* | | | | | | | | | | | | | Merge branch 'adding-package-lock-ignore' into 'master'Phil Hughes2018-06-151-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update .gitignore with ignoring package-lock.json See merge request gitlab-org/gitlab-ce!19890
| * | | | | | | | | | | | | | Update .gitignore with ignoring package-lock.jsonDimitrie Hoekstra2018-06-151-0/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'fix-rails5-nagative-enum-spec' into 'master'Kamil Trzciński2018-06-151-8/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix "[Rails5] '-1' is not a valid data_store" Closes #47369 See merge request gitlab-org/gitlab-ce!19882
| * | | | | | | | | | | | | | Remove unexpected data store test suitefix-rails5-nagative-enum-specShinya Maeda2018-06-151-8/+0
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix "[Rails5] '-1' is not a valid data_store"Shinya Maeda2018-06-151-1/+1
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'ide-add-last-commit-id-to-api-call' into 'master'Douwe Maan2018-06-156-117/+107
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IDE sends last commit ID when committing changes Closes #46192 See merge request gitlab-org/gitlab-ce!19552
| * | | | | | | | | | | | | | only return last_commit_sha in the JSONide-add-last-commit-id-to-api-callPhil Hughes2018-06-155-13/+8
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | IDE sends last commit ID when committing changesPhil Hughes2018-06-156-117/+112
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #46192
* | | | | | | | | | | | | | Merge branch 'fl-reduce-tech-debt' into 'master'Phil Hughes2018-06-151-15/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes unused imports and prettifies code See merge request gitlab-org/gitlab-ce!19888
| * | | | | | | | | | | | | Removes unused imports and prettifies codefl-reduce-tech-debtFilipa Lacerda2018-06-151-15/+20
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | 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
| | | | | | | | | | | | | |