summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Update project activity when pushing to a wiki repositoryda-update-project-activityDouglas Barbosa Alexandre2018-03-071-0/+12
|
* Merge branch 'bvl-allow-maintainer-to-push' into 'master'Douwe Maan2018-03-0719-5/+497
|\ | | | | | | | | | | | | Allow maintainers to push forks of a project for branches that have open MRs Closes #22292 See merge request gitlab-org/gitlab-ce!17395
| * Only allow users that can merge to push to sourcebvl-allow-maintainer-to-pushBob Van Landuyt2018-03-072-12/+22
| | | | | | | | | | We only allow users that can merge the merge request to push to the fork.
| * Limit queries to a user-branch combinationBob Van Landuyt2018-03-074-30/+70
| | | | | | | | | | The query becomes a lot simpler if we can check the branch name as well instead of having to load all branch names.
| * Set `allow_maintainer_to_push` using the APIBob Van Landuyt2018-03-072-1/+30
| |
| * Allow maintainers to edit directly in a forkBob Van Landuyt2018-03-074-2/+63
| |
| * Allow maintainers to push to a single branchBob Van Landuyt2018-03-071-0/+35
| |
| * Allow abilities on forks while MR is openBob Van Landuyt2018-03-074-3/+93
| | | | | | | | | | | | | | | | When an MR is created using `allow_maintainer_to_push`, we enable some abilities while the MR is open. This should allow every user with developer abilities on the target project, to push to the source project.
| * Allow a user to select `allow maintainer to push`Bob Van Landuyt2018-03-078-1/+228
| | | | | | | | | | | | When a project is not private, and the source branch not protected the user can now select the option to allow maintainers to push to this branch
* | Merge branch 'jivl-new-modal-project-labels-milestones' into 'master'Filipa Lacerda2018-03-073-4/+173
|\ \ | | | | | | | | | | | | | | | | | | Resolve: Modal and banner designs for project label and project milestone promotion Closes #41895 See merge request gitlab-org/gitlab-ce!17197
| * | used respond_to formats for persisting flash messages insteadjivl-new-modal-project-labels-milestonesJose Ivan Vargas2018-03-064-12/+3
| | |
| * | Add persistent flash messagesJose Ivan Vargas2018-03-012-4/+2
| | |
| * | Changed selector names, address code concernsJose Ivan Vargas2018-03-012-28/+15
| | |
| * | Added vue based promotion modals for labels and milestonesJose Ivan Vargas2018-03-013-1/+194
| | |
* | | Merge branch 'gitaly-git-mandatory' into 'master'Douwe Maan2018-03-071-26/+2
|\ \ \ | | | | | | | | | | | | | | | | Make git push mandatory See merge request gitlab-org/gitlab-ce!17565
| * | | fix specsgitaly-git-mandatoryKim "BKC" Carlbäcker2018-03-071-26/+2
| | | |
* | | | Merge remote-tracking branch 'dev/master'Robert Speicher2018-03-071-0/+12
|\ \ \ \
| * | | | Merge branch 'sh-fix-otp-backup-invalidation-10-5' into 'security-10-5'Douwe Maan2018-03-071-0/+12
| | |/ / | |/| | | | | | | | | | | | | | Ensure that OTP backup codes are always invalidated - 10.5 port See merge request gitlab/gitlabhq!2324
* | | | Merge branch 'zj-move-opt-out-ruby-endpoints' into 'master'Sean McGivern2018-03-071-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Move Ruby endpoints to OPT_OUT See merge request gitlab-org/gitlab-ce!17561
| * | | | Fix tests not completely disabling GitalyZeger-Jan van de Weg2018-03-071-3/+3
| | | | |
* | | | | Merge branch 'tc-geo-local-only-counts-matcher' into 'master'Nick Thomas2018-03-071-0/+24
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Backport of "Geo: Ignore remote stored objects when calculating counts" See merge request gitlab-org/gitlab-ce!17581
| * | | | Add matcher to match elements by idstc-geo-local-only-counts-matcherToon Claes2018-03-061-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | Initially added in gitlab-org/gitlab-ee!4864 and gitlab-org/gitlab-ee!4689.
* | | | | Merge branch 'mr-commit-optimization' into 'master'Sean McGivern2018-03-072-7/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use persisted/memoized value for MRs sha's instead of doing git lookups See merge request gitlab-org/gitlab-ce!17555
| * | | | | Don't do a commit lookup to present the MR entity, just return the shamr-commit-optimizationAlejandro Rodríguez2018-03-061-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MergeRequestWidgetEntity is used a lot in AJAX requests, and shaving that git operation will hopefully translate in a performance improvement
| * | | | | Use persisted/memoized value for MRs shas instead of doing git lookupsAlejandro Rodríguez2018-03-061-3/+3
| | | | | |
* | | | | | Merge branch 'jprovazn-api' into 'master'Sean McGivern2018-03-076-505/+502
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add discussion API See merge request gitlab-org/gitlab-ce!17510
| * | | | | | Add discussion APIjprovazn-apiJan Provaznik2018-03-076-505/+502
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * adds basic discussions API for issues and snippets * reorganizes notes specs (so same tests can be used for all noteable types - issues, MRs, snippets)
* | | | | | | Merge branch '43460-track-projects-a-user-contributed-to' into 'master'Yorick Peterse2018-03-072-0/+76
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep track of projects a user interacted with Closes #43460 See merge request gitlab-org/gitlab-ce!17327
| * | | | | | | Operate on ids to avoid unnecessary loading.Andreas Brandl2018-03-061-2/+2
| | | | | | | |
| * | | | | | | Singularize model name.Andreas Brandl2018-03-062-7/+7
| | | | | | | |
| * | | | | | | Rename to UserInteractedProjects.Andreas Brandl2018-03-062-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to avoid a mix-up with the existing concept of 'user contributions'. See `User#contributed_projects` or `Event#contributions`.
| * | | | | | | Only track contributions if table is available.Andreas Brandl2018-03-062-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is due to the problem that the callback can be called while running an earlier database schema version (for example during earlier migrations). We work around this by checking the current schema version and only track contributions if the table is available.
| * | | | | | | Address rubocop offenses.Andreas Brandl2018-03-061-6/+5
| | | | | | | |
| * | | | | | | Treat special cases accordingly.Andreas Brandl2018-03-061-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Event without project * Fail early on unexpectedly missing author
| * | | | | | | Cache project/user combinations.Andreas Brandl2018-03-061-3/+4
| | | | | | | |
| * | | | | | | Track which projects a user contributed to.Andreas Brandl2018-03-062-0/+45
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Closes #43460.
* | | | | | | Merge branch 'dz-plugins-project-integrations' into 'master'Dmitriy Zaporozhets2018-03-071-0/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show plugins list on system hooks page Closes #40812 See merge request gitlab-org/gitlab-ce!17518
| * | | | | | | Add feature test for plugins on system hooks pagedz-plugins-project-integrationsDmitriy Zaporozhets2018-03-061-0/+10
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Count discussions on issues and merge requests as contributions for the ↵Riccardo Padovani2018-03-071-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | contributions calendar
* | | | | | | Merge branch '43502-clipboard-btn' into 'master'Phil Hughes2018-03-071-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Update clipboard button component not to render default css classes" Closes #43502 See merge request gitlab-org/gitlab-ce!17529
| * | | | | | | Removes btn-transparent and btn-clipboard as default classes for clipboard ↵43502-clipboard-btnFilipa Lacerda2018-03-061-0/+5
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | button component Changes after review
* | | | | | | Merge branch 'master' into 'master'Grzegorz Bizon2018-03-071-0/+45
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI charts now include the current day Closes #42921 See merge request gitlab-org/gitlab-ce!17032
| * | | | | | CI charts now include the current dayDakkaron2018-03-061-0/+45
| | | | | | |
* | | | | | | Merge branch 'sh-make-prune-optional-in-git-fetch' into 'master'43962-add-wip-to-merge-requests-titles-by-default43958-include-adding-a-specific-runner-to-another-project-from-the-admin-area-to-docsNick Thomas2018-03-073-17/+49
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make --prune a configurable parameter in fetching a git remote See merge request gitlab-org/gitlab-ce!17346
| * | | | | | | Make --prune a configurable parameter in fetching a git remotesh-make-prune-optional-in-git-fetchStan Hu2018-03-063-17/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, --prune is added to the command-line of a `git fetch` operation, but for repositories with many references this can take a long time to run. We shouldn't need to run --prune the first time we fetch a new repository.
* | | | | | | | Remove common_vue bundleMike Greiling2018-03-061-6/+7
| | | | | | | |
* | | | | | | | Gitlab::Utils - backport `.ensure_array_from_string` from EEMario de la Ossa2018-03-061-1/+15
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch ↵Kamil Trzciński2018-03-061-0/+64
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'move-pipeline_default-update_head_pipeline_for_merge_request-queue-to-pipeline_processing-namespace' into 'master' Move update_head_pipeline_for_merge_request queue to `pipeline_processing` namespace Closes #43919 See merge request gitlab-org/gitlab-ce!17572
| * | | | | | | Move update_head_pipeline_for_merge_request queue to pipeline_processing ↵Shinya Maeda2018-03-071-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | namespace
* | | | | | | | Merge branch 'sha256-checksum-for-trace' into 'master'Kamil Trzciński2018-03-061-4/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set sha256 checksum when archiving traces Closes #43940 See merge request gitlab-org/gitlab-ce!17570
View Lorry Controller Status