summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Update CHANGELOG.md for 10.4.0Luke Bennett2018-01-22138-695/+164
| | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch '42212-order-of-steps-in-auto-devops-do' into 'master'Achilleas Pipinellis2018-01-221-28/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Order of steps in Auto DevOps documentation" Closes #42212 See merge request gitlab-org/gitlab-ce!16576
| * | | | | | | Change order of jobs in Auto DevOps doc42212-order-of-steps-in-auto-devops-doFabio Busatto2018-01-191-28/+28
| | | | | | | |
* | | | | | | | Merge branch 'vue-mr-widget-state' into 'master'Phil Hughes2018-01-224-69/+89
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Move mr_widget_auto_merge_failed component into a vue file See merge request gitlab-org/gitlab-ce!16564
| * | | | | | | Merge branch 'master' into vue-mr-widget-stateFilipa Lacerda2018-01-2271-86/+198
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Split the setup-test-env job in two Remove the wait time for the login form check Fix protected branches API to accept name parameter with dot Update outdated docs for CI/CD quick start _never_ unset gitlab.full_path Backport to match EE icons Add horizontal scroll to wiki tables Update best_practices.md Remove duplicate list item in "General Guidelines" Section. Permits 'password_authentication_enabled_for_git' parameter for ApplicationSettingsController Move rugged-call from Project#write_repository_config to Git::Repository#write_config doc: Spelling fixes Update Auto DevOps template Disable scss-lint around text-decoration-skip Add text-decoration-skip: ink to all underlined elements Fix Shows signin tab after new user email confirmation Fixes mistake in change log doc.
| * | | | | | | Update icon to match EEvue-mr-widget-stateFilipa Lacerda2018-01-191-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' into vue-mr-widget-stateFilipa Lacerda2018-01-19205-2516/+3797
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (39 commits) WebIDE: Fix Commit bugs Resolve "Projects API: filter 'with_issues_enabled=true' returns projects with 'issues_enabled=false'" Fix incorrect path for gitlab-shell authorized keys helper Fix duplicate item in protected branch/tag dropdown dynamic imports for groups: pages Refactor dispatcher project mr edit and creation diff path Refactor dispatcher project mr creations new path Rework indexes on redirect_routes to be more effective and enforce a case insensitive unique path Upgraded Karma Dependencies Fix conflict with ee icon Remove trailing space after author name in note header Delete conflicting orphaned routes Make the 'Edit' links consistent in the issuable sidebar Fix a bug calculating artifact size for project statistics Update rubocop, rubocop-rspec, and gitlab-styles Correctly escape UTF-8 path elements for uploads Change cursor to default for disabled buttons Fix eslint Remove Event listener and make code more readable. Update CHANGELOG.md for 10.1.7 ...
| * | | | | | | | Move mr_widget_auto_merge_failed component into a vue fileFilipa Lacerda2018-01-185-69/+92
| | | | | | | | |
* | | | | | | | | Merge branch 'docs/dast-cleanup' into 'master'Marcia Ramos2018-01-221-8/+13
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more info on how DAST works See merge request gitlab-org/gitlab-ce!16615
| * | | | | | | | | Add more info on how DAST worksAchilleas Pipinellis2018-01-221-8/+13
| | | | | | | | | |
* | | | | | | | | | Merge branch 'patch-19' into 'master'Rémy Coutable2018-01-221-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | minor typo fix See merge request gitlab-org/gitlab-ce!16543
| * | | | | | | | | typo fixBen Bodenmiller2018-01-181-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'split-setup-test-env' into 'master'Rémy Coutable2018-01-221-3/+16
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce CI pipeline runtime by about 4-6 minutes See merge request gitlab-org/gitlab-ce!16593
| * | | | | | | | | | Split the setup-test-env job in twoNick Thomas2018-01-191-3/+16
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '42225-mr-icons' into 'master'Phil Hughes2018-01-2212-15/+15
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "MR widget components have different icons in CE and EE" Closes #42225 See merge request gitlab-org/gitlab-ce!16587
| * | | | | | | | | | | Backport to match EE icons42225-mr-iconsFilipa Lacerda2018-01-1912-15/+15
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'gitaly-write-repo-config-prep' into 'master'Douwe Maan2018-01-222-1/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move rugged-call from Project#write_repository_config to Git::Repository#write_config See merge request gitlab-org/gitlab-ce!16572
| * | | | | | | | | | | _never_ unset gitlab.full_pathgitaly-write-repo-config-prepKim "BKC" Carlbäcker2018-01-191-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Move rugged-call from Project#write_repository_config to ↵Kim "BKC" Carlbäcker2018-01-192-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git::Repository#write_config
* | | | | | | | | | | | Merge branch ↵Rémy Coutable2018-01-223-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '42231-protected-branches-api-route-returns-404-for-branches-with-dots' into 'master' Resolve "Protected branches API route returns 404 for branches with dots" Closes #42231 See merge request gitlab-org/gitlab-ce!16591
| * | | | | | | | | | | | Fix protected branches API to accept name parameter with dotMark Fletcher2018-01-193-1/+12
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '41814-text-decoration-skip' into 'master'Phil Hughes2018-01-222-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "introduce skip-ink underlines to improve readability dyslexic users" Closes #41814 See merge request gitlab-org/gitlab-ce!16569
| * | | | | | | | | | | | Disable scss-lint around text-decoration-skip41814-text-decoration-skipAnnabel Dunstone Gray2018-01-181-3/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add text-decoration-skip: ink to all underlined elementsAnnabel Dunstone Gray2018-01-182-1/+12
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '42206-permit-password-for-git-param' into 'master'Rémy Coutable2018-01-223-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Password authentication enabled for Git over HTTP(S) can not be disabled via UI" Closes #42206 See merge request gitlab-org/gitlab-ce!16577
| * | | | | | | | | | | | Permits 'password_authentication_enabled_for_git' parameter for ↵Mark Fletcher2018-01-193-0/+13
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ApplicationSettingsController
* | | | | | | | | | | | Merge branch 'update-auto-devops-template' into 'master'Rémy Coutable2018-01-221-2/+40
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Auto DevOps template See merge request gitlab-org/gitlab-ce!16574
| * | | | | | | | | | | | Update Auto DevOps templateupdate-auto-devops-templateAchilleas Pipinellis2018-01-191-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | Merge branch 'qa/rs-remove-login-wait' into 'master'Grzegorz Bizon2018-01-201-7/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the wait time for the login form check See merge request gitlab-org/gitlab-ce!16594
| * | | | | | | | | | | | | Remove the wait time for the login form checkqa/rs-remove-login-waitRobert Speicher2018-01-191-7/+9
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "Change your password" text is either on the page or it isn't. There's no benefit to using Capybara's default waiting behavior here, as it will never load in via AJAX, for example.
* | | | | | | | | | | | | Merge branch '41206-show-signin-pane-after-email-confirmation' into 'master'Clement Ho2018-01-206-5/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | / / / | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "New user is sent back to Register tab after confirming email" Closes #41206 See merge request gitlab-org/gitlab-ce!16174
| * | | | | | | | | | | Fix Shows signin tab after new user email confirmationJacopo2018-01-186-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a new user confirm his email the signin tab is correctly shown.
* | | | | | | | | | | | Merge branch 'docs/ci-quick-start-typo' into 'master'Marcia Ramos2018-01-191-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update outdated docs for CI/CD quick start See merge request gitlab-org/gitlab-ce!16590
| * | | | | | | | | | | | Update outdated docs for CI/CD quick startdocs/ci-quick-start-typoAchilleas Pipinellis2018-01-191-3/+3
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | Merge branch 'patch-28' into 'master'Achilleas Pipinellis2018-01-191-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update best_practices.md See merge request gitlab-org/gitlab-ce!16579
| * | | | | | | | | | | | Update best_practices.mdAnwar El Wakil2018-01-191-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate list item in "General Guidelines" Section.
* | | | | | | | | | | | | Merge branch 'spelling' into 'master'Achilleas Pipinellis2018-01-1936-46/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc: Spelling fixes See merge request gitlab-org/gitlab-ce!16575
| * | | | | | | | | | | | doc: Spelling fixesVille Skyttä2018-01-1936-46/+46
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'fix/add-horizontal-scroll-to-wiki-tables' into 'master'Annabel Dunstone Gray2018-01-192-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add horizontal scroll to wiki tables #26557 See merge request gitlab-org/gitlab-ce!16527
| * | | | | | | | | | | | | Add horizontal scroll to wiki tablesGeorge Tsiolis2018-01-192-0/+7
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'fix_change_log_doc' into 'master'Robert Speicher2018-01-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes mistake in change log doc. [ci skip] See merge request gitlab-org/gitlab-ce!16541
| * | | | | | | | | | | | | Fixes mistake in change log doc.Tom Bosmans2018-01-181-2/+2
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'fix-redirect-routes-schema' into 'master'Yorick Peterse2018-01-194-3/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rework indexes on redirect_routes See merge request gitlab-org/gitlab-ce!16211
| * | | | | | | | | | | | Rework indexes on redirect_routes to be more effective and enforce a case ↵fix-redirect-routes-schemaGreg Stark2018-01-184-3/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | insensitive unique path
* | | | | | | | | | | | | Merge branch 'mr-widget-vue' into 'master'Phil Hughes2018-01-195-39/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move archived component to vue file See merge request gitlab-org/gitlab-ce!16561
| * | | | | | | | | | | | Fix conflict with ee iconmr-widget-vueFilipa Lacerda2018-01-181-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Move archived component to vue fileFilipa Lacerda2018-01-185-39/+60
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '41532-email-reason' into 'master'Sean McGivern2018-01-1917-94/+288
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show why a notification email was sent Closes #41532 and #1366 See merge request gitlab-org/gitlab-ce!16160
| * | | | | | | | | | | | | Initial work to add notification reason to emailsMario de la Ossa2018-01-1617-94/+288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds `#build_notification_recipients` to `NotificationRecipientService` that returns the `NotificationRecipient` objects in order to be able to access the new attribute `reason`. This new attribute is used in the different notifier methods in order to add the reason as a header: `X-GitLab-NotificationReason`. Only the reason with the most priority gets sent.
* | | | | | | | | | | | | | Merge branch 'sh-fix-authorized-keys-docs' into 'master'Nick Thomas2018-01-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrect path for gitlab-shell authorized keys helper See merge request gitlab-org/gitlab-ce!16571