summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'tz-upgrade-vue-again' into 'master'Filipa Lacerda2018-01-2313-42/+56
|\ | | | | | | | | Upgraded all vue libraries See merge request gitlab-org/gitlab-ce!16413
| * Upgraded all vue librariesTim Zallmann2018-01-2313-42/+56
| |
* | Merge branch 'gitaly-update-remote-mirror' into 'master'Rémy Coutable2018-01-231-0/+14
|\ \ | | | | | | | | | | | | | | | | | | Incorporate Gitaly's RemoteService.UpdateRemoteMirror RPC Closes gitaly#936 See merge request gitlab-org/gitlab-ce!16536
| * | Incorporate Gitaly's RemoteService.UpdateRemoteMirror RPCgitaly-update-remote-mirrorAlejandro Rodríguez2018-01-221-0/+14
| | |
* | | Merge branch 'gitaly-user-commit-files' into 'master'Douwe Maan2018-01-235-12/+48
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Incorporate Gitaly's OperationService.UserCommitFiles RPC Closes gitaly#890 See merge request gitlab-org/gitlab-ce!16307
| * | Incorporate Gitaly's OperationService.UserCommitFiles RPCgitaly-user-commit-filesAlejandro Rodríguez2018-01-222-8/+35
| | |
| * | Ensure hooks are deleted regardless of the project forking methodAlejandro Rodríguez2018-01-193-4/+13
| | |
* | | Merge branch '42119-non-triggered' into 'master'Grzegorz Bizon2018-01-231-3/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve ""This job has not been triggered yet" after hitting "Retry"" Closes #42119 See merge request gitlab-org/gitlab-ce!16583
| * | | Improve copy for the pending state42119-non-triggeredFilipa Lacerda2018-01-221-2/+2
| | | |
| * | | Improve pending case testFilipa Lacerda2018-01-221-2/+2
| | | |
| * | | Adds information for pending stateFilipa Lacerda2018-01-221-4/+5
| | | |
| * | | Update testsFilipa Lacerda2018-01-191-2/+1
| | | |
| * | | Do not render non triggered empty state for pending jobsFilipa Lacerda2018-01-191-0/+14
| | | | | | | | | | | | | | | | Put back non triggered information
* | | | Merge branch ↵Robert Speicher2018-01-222-6/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '40612-cannot-change-project-visibility-from-private-even-when-owner' into 'master' Resolve "Cannot change project visibility from Private (even when owner)" Closes #40612 See merge request gitlab-org/gitlab-ce!16595
| * | | | fix spacing and wrap method params in parensMike Greiling2018-01-221-3/+3
| | | | |
| * | | | add test to can_change_visibility_level? methodMike Greiling2018-01-221-4/+14
| | | | |
| * | | | ensure fork_source returns nil when project is the root fork, add testsMike Greiling2018-01-221-0/+4
| | |_|/ | |/| |
* | | | Merge branch 'add-profiler-to-application' into 'master'Stan Hu2018-01-221-0/+156
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add Gitlab::Profiler for profiling from a console or runner See merge request gitlab-org/gitlab-ce!16552
| * | | | Add Gitlab::Profiler for profiling from a console or runnerSean McGivern2018-01-191-0/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::Profiler.profile takes a URL to profile, and returns the ruby-prof profile result. This is currently only for interactive use (in a console) or from the script runner. Note that when using this interactively, changes to the application within that console session will be used, so this can be used to test proposed performance changes.
* | | | | Merge branch 'sh-fix-error-500-no-avatars' into 'master'Robert Speicher2018-01-222-1/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when repository has no avatar Closes #42249 See merge request gitlab-org/gitlab-ce!16601
| * | | | | Fix Error 500 when repository has no avatarsh-fix-error-500-no-avatarsStan Hu2018-01-202-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | Closes #42249
* | | | | | Default to Gitaly for 'git push' HTTP/SSH, and make Gitaly mandatory for SSH ↵Jacob Vosmaer (GitLab)2018-01-221-28/+13
| | | | | | | | | | | | | | | | | | | | | | | | pull
* | | | | | Preload ancestors for subgroups matching filterBob Van Landuyt2018-01-222-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we'd only preload the ancestors that would fit the page. That way, when a search result was on the first page, but the ancestor didn't fit the page anymore. We would not have the preloaded ancestor when rendering the hierarchy.
* | | | | | Don't include projects shared as group-descendantsBob Van Landuyt2018-01-221-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a project is shared with a group, it should not be included as a descendant on the group dashboard.
* | | | | | Fix filter on `dashboard/groups` & `explore/groupsBob Van Landuyt2018-01-221-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When searching we would limit the scope of ancestors to load because the filter would be applied to the ancestors. Instead, we need to load _all_ ancestors for matching projects.
* | | | | | Merge branch 'ce-fix-upload-model-tainted-after-migration-spec' into 'master'Rémy Coutable2018-01-221-3/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the Upload model being tainted after migration spec See merge request gitlab-org/gitlab-ce!16585
| * | | | | | Fix the Upload model being tainted after migration specMicael Bergeron2018-01-221-3/+10
| | | | | | |
* | | | | | | Merge branch '41673-blank-query-members-api' into 'master'Rémy Coutable2018-01-223-0/+36
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Project/#/Members?query= blank causes 500 error" Closes #41673 See merge request gitlab-org/gitlab-ce!16235
| * | | | | | Yield no results for blank searches on User name, username and emailMark Fletcher2018-01-211-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Given no search term, the `search` and `search_with_secondary_emails` methods will yield an empty result set
| * | | | | | Fix error on empty query for Members APIMark Fletcher2018-01-212-0/+20
| | | | | | |
* | | | | | | Merge branch '41208-commit-atom-feeds-double-escaped' into 'master'Douwe Maan2018-01-221-1/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Commits atom feed is double-escaped" Closes #41208 See merge request gitlab-org/gitlab-ce!16603
| * | | | | | | Allows html in commits atom feedJacopo2018-01-221-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Html code now works in commits atom feed `title` and `summary`.
* | | | | | | | Merge branch 'master' into vue-mr-widget-stateFilipa Lacerda2018-01-224-4/+24
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| * \ \ \ \ \ \ \ Merge branch '42225-mr-icons' into 'master'Phil Hughes2018-01-221-4/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-191-4/+4
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge branch ↵Rémy Coutable2018-01-221-0/+6
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-191-0/+6
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge branch '42206-permit-password-for-git-param' into 'master'Rémy Coutable2018-01-221-0/+7
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-191-0/+7
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | ApplicationSettingsController
| * | | | | | | Merge branch '41206-show-signin-pane-after-email-confirmation' into 'master'Clement Ho2018-01-201-0/+7
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | / / / / | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | 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-181-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When a new user confirm his email the signin tab is correctly shown.
* | | | | | | Merge branch 'master' into vue-mr-widget-stateFilipa Lacerda2018-01-1982-1817/+1584
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | | | | Merge branch 'mr-widget-vue' into 'master'Phil Hughes2018-01-191-12/+25
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Move archived component to vue file See merge request gitlab-org/gitlab-ce!16561
| | * | | | | Move archived component to vue fileFilipa Lacerda2018-01-181-12/+25
| | | | | | |
| * | | | | | Merge branch '41532-email-reason' into 'master'Sean McGivern2018-01-195-5/+121
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-165-5/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | WebIDE: Fix Commit bugsTim Zallmann2018-01-194-19/+15
| | | | | | | |
| * | | | | | | Merge branch '42157-41989-fix-duplicate-in-create-item-dropdown' into 'master'Phil Hughes2018-01-192-0/+119
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix duplicate item in protected branch/tag dropdowns Closes #42157 and #41989 See merge request gitlab-org/gitlab-ce!16540
| | * | | | | | | Fix duplicate item in protected branch/tag dropdown42157-41989-fix-duplicate-in-create-item-dropdownEric Eastwood2018-01-182-0/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/42157 Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41989
| * | | | | | | | Merge branch 'fix-description-loss' into 'master'Phil Hughes2018-01-191-0/+33
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add confirm when navigating away from page Closes #42102 See merge request gitlab-org/gitlab-ce!16518
View Lorry Controller Status